diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 03:13:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 03:26:35 +0100 |
| commit | 5231eecdafff38d0b604c028be08f8fb78d55e53 (patch) | |
| tree | 325e3398888cbae2afcef0f3c91dc8a347f53168 /libavcodec/xvmc_internal.h | |
| 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/xvmc_internal.h')
| -rw-r--r-- | libavcodec/xvmc_internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/xvmc_internal.h b/libavcodec/xvmc_internal.h index 04197cefae..6a60add965 100644 --- a/libavcodec/xvmc_internal.h +++ b/libavcodec/xvmc_internal.h @@ -23,6 +23,9 @@ #include "avcodec.h" #include "mpegvideo.h" +#include "version.h" + +#if FF_API_XVMC void ff_xvmc_init_block(MpegEncContext *s); void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp); @@ -30,4 +33,6 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx); void ff_xvmc_field_end(MpegEncContext *s); void ff_xvmc_decode_mb(MpegEncContext *s); +#endif /* FF_API_XVMC */ + #endif /* AVCODEC_XVMC_INTERNAL_H */ |