diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:41:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:42:11 +0200 |
| commit | c45e9097d839e69ab74160386db5e9728deaaf62 (patch) | |
| tree | 18137c3f98157eb921580f264c719a5c0651cbbe | |
| parent | 24da9eb25d63b80102934aab71efcf5ace2ede03 (diff) | |
| parent | ec17d1aa8b833d49d8fc479e44e9e22858aa486c (diff) | |
| download | ffmpeg-c45e9097d839e69ab74160386db5e9728deaaf62.tar.gz | |
Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
doc: Drop VDPAU from list of supported codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 79df64f6f8..b45c18a38b 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -605,7 +605,6 @@ following image formats are supported: @item H.263+ / H.263-1998 / H.263 version 2 @tab X @tab X @item H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 @tab E @tab X @tab encoding supported through external library libx264 -@item H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration) @tab E @tab X @item HuffYUV @tab X @tab X @item HuffYUV FFmpeg variant @tab X @tab X @item IBM Ultimotion @tab @tab X @@ -658,7 +657,6 @@ following image formats are supported: @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-1/2 video (VDPAU acceleration) @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. |