From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 3 Mar 2011 02:37:44 +0000 (+0100)
Subject: Fix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi
X-Git-Tag: android-x86-4.4-r1~18273
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b4580d1a2a09856a47a2d4f77ac7facff79baf8;p=android-x86%2Fexternal-ffmpeg.git

Fix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi
---

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 1c73d93405..d341090fa6 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -383,6 +383,16 @@ uint64_t time= rdtsc();
 
 
 retry:
+    if(s->divx_packed && s->xvid_build>=0 && s->bitstream_buffer_size){
+        int i;
+        for(i=0; i<buf_size-3; i++){
+            if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1){
+                if(buf[i+3]==0xB0)
+                    s->bitstream_buffer_size=0;
+                break;
+            }
+        }
+    }
 
     if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid frame reorder
         init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8);