[FFmpeg-cvslog] x86: dsputil: Simplify xvmc deprecation conditional

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jan 14 18:24:03 2014 +0100| [aab40bbfd5a7df1489500656a95448a0c53c1bd5] | committer: Diego Biurrun

x86: dsputil: Simplify xvmc deprecation conditional

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aab40bbfd5a7df1489500656a95448a0c53c1bd5
---

 libavcodec/x86/dsputil_init.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index c339e8f..82864e8 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -24,6 +24,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/simple_idct.h"
+#include "libavcodec/version.h"
 #include "dsputil_x86.h"
 #include "idct_xvid.h"
 
@@ -592,21 +593,20 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx,
 #if HAVE_SSE_INLINE
     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
 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
 #endif /* FF_API_XVMC */
+
+    if (!high_bit_depth) {
         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;
 #endif /* HAVE_SSE_INLINE */
 }