diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-14 02:04:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-14 02:10:11 +0100 |
| commit | 6968a7d1938cc009bad7a971f26d85ed271747ef (patch) | |
| tree | eb106dfbdfe9a7bc9d7fe53ead7b56c725d406fe /doc | |
| parent | c2e3b564b32d596f5a66d47409f9e07a067a3084 (diff) | |
| parent | 972880f597d74673a04d3ea8540864ae715ce9a6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/general: update supported devices table.
doc/general: add missing @tab to codecs table.
h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
avconv: reindent
avconv: link '-passlogfile' option to libx264 'stats' AVOption.
libx264: add 'stats' private option for setting 2pass stats filename.
libx264: fix help text for slice-max-size option.
http: Clear the auth state on redirects
http: Retry auth if it failed due to being stale
rtsp: Resend new keepalive commands if they used stale auth
rtsp: Retry authentication if failed due to being stale
httpauth: Parse the stale field in digest auth
dxva2_vc1: pass the overlap flag to the decoder
dxva2_vc1: fix decoding of BI frames
FATE: add shorthand to wavpack test
dfa: convert to bytestream2 API
anm decoder: move buffer allocation from decode_init() to decode_frame()
h264: improve parsing of broken AVC SPS
Conflicts:
ffmpeg.c
libavcodec/anm.c
libavcodec/dfa.c
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 7770046132..dd744f0641 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -863,11 +863,12 @@ performance on systems without hardware floating point support). @item ALSA @tab X @tab X @item BKTR @tab X @tab @item DV1394 @tab X @tab +@item Linux framebuffer @tab X @tab @item JACK @tab X @tab +@item LIBCDIO @tab X @item LIBDC1394 @tab X @tab @item OSS @tab X @tab X @item Pulseaudio @tab X @tab -@item Video4Linux @tab X @tab @item Video4Linux2 @tab X @tab @item VfW capture @tab X @tab @item X11 grabbing @tab X @tab |