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 /libavcodec/mpeg12.c | |
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 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index dad3d4c276..09b1f19e48 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -40,7 +40,6 @@ #include "mpeg12data.h" #include "bytestream.h" #include "vdpau_internal.h" -#include "xvmc_internal.h" #include "thread.h" uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; |