diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-24 00:19:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-24 02:30:41 +0200 |
| commit | 3bbf3f7e42247b7a8b34b1e8cc891b59e1327bb8 (patch) | |
| tree | bf3b0776b76e0f5c4c331d9d069f16e3c0236a9c /doc | |
| parent | 2e8f19d26f3ef7e804a7f9f9811e4b538e0a5969 (diff) | |
| parent | 7521c4bab28ff3a622171be5b39a6b210f4263f0 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroska: Clear prev_pkt between seeks.
avutil: change default buffer size alignment for sample buffer functions
audemux: Add a sanity check for the number of channels
Remove libdirac decoder.
matroska: Add incremental parsing of clusters.
avconv: fix off by one check in complex_filter
mpegts: Try seeking back even for nonseekable protocols
swscale: K&R formatting cosmetics (part III)
Conflicts:
configure
doc/general.texi
doc/platform.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavformat/au.c
libavformat/mpegts.c
libswscale/input.c
tests/ref/seek/lavf_mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | doc/platform.texi | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/general.texi b/doc/general.texi index c633ba6532..4ef1d6d80c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -482,7 +482,7 @@ following image formats are supported: @item DFA @tab @tab X @tab Codec used in Chronomaster game. @item Dirac @tab E @tab X - @tab supported through external libdirac/libschroedinger libraries + @tab supported through external library libschroedinger @item Deluxe Paint Animation @tab @tab X @item DNxHD @tab X @tab X @tab aka SMPTE VC3 diff --git a/doc/platform.texi b/doc/platform.texi index b52e13a94d..d1a1f94481 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -354,9 +354,8 @@ These library packages are only available from @uref{http://sourceware.org/cygwinports/, Cygwin Ports}: @example -yasm, libSDL-devel, libdirac-devel, libfaac-devel, libaacplus-devel, libgsm-devel, -libmp3lame-devel, libschroedinger1.0-devel, speex-devel, libtheora-devel, -libxvidcore-devel +yasm, libSDL-devel, libfaac-devel, libaacplus-devel, libgsm-devel, libmp3lame-devel, +libschroedinger1.0-devel, speex-devel, libtheora-devel, libxvidcore-devel @end example The recommendation for libnut and x264 is to build them from source by |