[SCM] libav/experimental: Skip unnecessary calculations in 4col-mode.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bbc26bae117b9bfb85a129e5705715bd1df08380
Author: Tobias Bindhammer <tobias.bindhammer at uni-ulm.de>
Date:   Tue Oct 5 12:14:27 2010 +0000

    Skip unnecessary calculations in 4col-mode.
    
    Originally committed as revision 25347 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
index 1cbd064..e184ca9 100644
--- a/libavcodec/a64multienc.c
+++ b/libavcodec/a64multienc.c
@@ -138,7 +138,7 @@ static void render_charset(AVCodecContext *avctx, uint8_t *charset,
             if(INTERLACED) charset[y+0x800] = row2;
         }
         /* do we need to adjust pixels? */
-        if (highdiff > 0 && lowdiff > 0) {
+        if (highdiff > 0 && lowdiff > 0 && c->mc_use_5col) {
             if (lowdiff > highdiff) {
                 for (x = 0; x < 32; x++)
                     best_cb[x] = FFMIN(c->mc_luma_vals[3], best_cb[x]);

-- 
Libav/FFmpeg packaging