[SCM] libav/experimental: h263enc: keep block_last_index always valid during advanced intra coding

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cd62c04d009b3baf7582556866a7029291b54573
Author: Janne Grunau <janne-libav at jannau.net>
Date:   Tue Jun 10 20:50:13 2014 +0200

    h263enc: keep block_last_index always valid during advanced intra coding
    
    Prevents a triggered assert during fate-vsynth{1,2}-rv20 in
    dct_unquantize_h263_intra_c().

diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index cd4ed84..5f15b2f 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -566,10 +566,6 @@ void ff_h263_encode_mb(MpegEncContext * s,
                 else
                     level = (level - (scale>>1))/scale;
 
-                /* AIC can change CBP */
-                if (level == 0 && s->block_last_index[i] == 0)
-                    s->block_last_index[i] = -1;
-
                 if(!s->modified_quant){
                     if (level < -127)
                         level = -127;
@@ -592,7 +588,9 @@ void ff_h263_encode_mb(MpegEncContext * s,
 
                 /* Update AC/DC tables */
                 *dc_ptr[i] = rec_intradc[i];
-                if (s->block_last_index[i] >= 0)
+                /* AIC can change CBP */
+                if (s->block_last_index[i] > 0 ||
+                    (s->block_last_index[i] == 0 && level !=0))
                     cbp |= 1 << (5 - i);
             }
         }else{

-- 
Libav/FFmpeg packaging