diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:24:22 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:24:22 +0400 |
commit | bf36dc50ea448999c8f8c7a35f6139a7040f6275 (patch) | |
tree | c6680553d1ea71baf7408233b6eec6ab92d75b8a /libavcodec/svq3.c | |
parent | b7fc2693c70fe72936e4ce124c802ac23857c476 (diff) | |
parent | 578ea75a9e4ac56e0bbbbe668700be756aa699f8 (diff) |
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
vdpau: remove old-style decoders
Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 3da341e667..07f9771ad4 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -52,7 +52,6 @@ #include "golomb.h" #include "hpeldsp.h" #include "rectangle.h" -#include "vdpau_internal.h" #if CONFIG_ZLIB #include <zlib.h> |