[SCM] libav/experimental: dsputilenc_mmx: Merge two assignment blocks with identical conditions

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Dec 25 16:49:23 2013 +0100

    dsputilenc_mmx: Merge two assignment blocks with identical conditions

diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
index a1f80af..e21ae24 100644
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@@ -981,9 +981,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx)
         c->nsse[1] = nsse8_mmx;
         if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
             c->vsad[0] = vsad16_mmx;
-        }
-
-        if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
             c->try_8x8basis= try_8x8basis_mmx;
         }
         c->add_8x8basis= add_8x8basis_mmx;

-- 
Libav/FFmpeg packaging