diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-11-05 08:16:31 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-11-13 21:07:45 +0100 |
| commit | 19e30a58fc8ee6187a0bc14aff7f566a13c81421 (patch) | |
| tree | faf20ff671c7a6e7f6984f30b058b22b59ca8c73 /libavcodec/x86 | |
| parent | c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac (diff) | |
| download | ffmpeg-19e30a58fc8ee6187a0bc14aff7f566a13c81421.tar.gz | |
Deprecate obsolete XvMC hardware decoding support
XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index cc35d240a0..aa4e37bf2f 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -611,11 +611,15 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, const int high_bit_depth = avctx->bits_per_raw_sample > 8; if (!high_bit_depth) { +#if FF_API_XVMC if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) { /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ - c->clear_block = ff_clear_block_sse; - c->clear_blocks = ff_clear_blocks_sse; +#endif /* FF_API_XVMC */ + c->clear_block = ff_clear_block_sse; + c->clear_blocks = ff_clear_blocks_sse; +#if FF_API_XVMC } +#endif /* FF_API_XVMC */ } c->vector_clipf = ff_vector_clipf_sse; |