[SCM] libav/experimental: Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks, slightly simplify code.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7b87519b323751d391318d9bbfa1e7bbf5f1e7fb
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Mon Jan 25 22:46:09 2010 +0000

    Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks, slightly
    simplify code.
    
    Originally committed as revision 30432 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 6bbd4fa..1a8b1f1 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1126,9 +1126,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
             av_log(c, AV_LOG_INFO, "using AltiVec\n");
         else
             av_log(c, AV_LOG_INFO, "using C\n");
-    }
 
-    if (flags & SWS_PRINT_INFO) {
         if (flags & SWS_CPU_CAPS_MMX) {
             if (c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR))
                 av_log(c, AV_LOG_VERBOSE, "using FAST_BILINEAR MMX2 scaler for horizontal scaling\n");

-- 
Libav/FFmpeg packaging