[SCM] libav/experimental: If consumed does not match nalsize, favor nalsize. Fixes issue385.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9d2cc8c1ee586c4f01745ed78ece1462119c68fb
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Mar 13 01:49:19 2008 +0000

    If consumed does not match nalsize, favor nalsize.
    Fixes issue385.
    
    Originally committed as revision 12430 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 014a292..e945774 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7495,8 +7495,10 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
             av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length);
         }
 
-        if (h->is_avc && (nalsize != consumed))
+        if (h->is_avc && (nalsize != consumed)){
             av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize);
+            consumed= nalsize;
+        }
 
         buf_index += consumed;
 

-- 
Libav/FFmpeg packaging