diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 15:31:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 22:17:49 +0200 |
| commit | a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7 (patch) | |
| tree | add4728a4e1bbc762e5c058259103e659455217a /libavcodec/mpeg12.c | |
| parent | 0a141b0e49ba3989a28f5f006a978bdab92a9217 (diff) | |
| download | ffmpeg-a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7.tar.gz | |
Revert "Merge commit of 'vdpau: remove old-style decoders'"
This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing
changes made to b7fc2693c70fe72936e4ce124c802ac23857c476.
Conflicts:
libavcodec/h264.c
Keeping support for the old VDPAU API has been requested by our VDPAU maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 184f953ac4..dad3d4c276 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -39,6 +39,7 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "bytestream.h" +#include "vdpau_internal.h" #include "xvmc_internal.h" #include "thread.h" |