virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

x86: dsputil: Simplify xvmc deprecation conditional

Browse Source
This commit is contained in:
Diego Biurrun 2014-01-14 18:24:03 +01:00
parent dc4d726bab
commit aab40bbfd5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/x86/dsputil_init.c
View File

@ -24,6 +24,7 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavcodec/simple_idct.h" #include "libavcodec/simple_idct.h"
#include "libavcodec/version.h"
#include "dsputil_x86.h" #include "dsputil_x86.h"
#include "idct_xvid.h" #include "idct_xvid.h"
@ -592,21 +593,20 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx,
#if HAVE_SSE_INLINE #if HAVE_SSE_INLINE
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
if (!high_bit_depth) { c->vector_clipf = ff_vector_clipf_sse;
#if FF_API_XVMC #if FF_API_XVMC
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) { /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
/* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ if (CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)
return;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */ #endif /* FF_API_XVMC */
if (!high_bit_depth) {
c->clear_block = ff_clear_block_sse; c->clear_block = ff_clear_block_sse;
c->clear_blocks = ff_clear_blocks_sse; c->clear_blocks = ff_clear_blocks_sse;
#if FF_API_XVMC
}
#endif /* FF_API_XVMC */
} }
c->vector_clipf = ff_vector_clipf_sse;
#endif /* HAVE_SSE_INLINE */ #endif /* HAVE_SSE_INLINE */
} }