diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 06:13:39 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 06:26:35 +0400 |
| commit | 5231eecdafff38d0b604c028be08f8fb78d55e53 (patch) | |
| tree | 325e3398888cbae2afcef0f3c91dc8a347f53168 /doc/general.texi | |
| parent | e25ed2608c960302d6f4832a5435c9672d78e282 (diff) | |
| parent | 19e30a58fc8ee6187a0bc14aff7f566a13c81421 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Deprecate obsolete XvMC hardware decoding support
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 775e437d00..3aecb1250a 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -663,7 +663,6 @@ following image formats are supported: @item Mobotix MxPEG video @tab @tab X @item Motion Pixels video @tab @tab X @item MPEG-1 video @tab X @tab X -@item MPEG-1/2 video XvMC (X-Video Motion Compensation) @tab @tab X @item MPEG-2 video @tab X @tab X @item MPEG-4 part 2 @tab X @tab X @tab libxvidcore can be used alternatively for encoding. |