changeset 2384:2b7be8fd6390 libavformat

remove broken movi_end skip-hack-check this should fix seeking over the first riff chunk in odml
author michael
date Tue, 14 Aug 2007 03:00:56 +0000
parents 4cd9594b588d
children 8a7b2fac0a98
files avidec.c
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/avidec.c	Tue Aug 14 02:27:31 2007 +0000
+++ b/avidec.c	Tue Aug 14 03:00:56 2007 +0000
@@ -674,14 +674,6 @@
     for(i=sync=url_ftell(pb); !url_feof(pb); i++) {
         int j;
 
-        if (i >= avi->movi_end) {
-            if (avi->is_odml) {
-                url_fskip(pb, avi->riff_end - i);
-                avi->riff_end = avi->movi_end = url_fsize(pb);
-            } else
-                break;
-        }
-
         for(j=0; j<7; j++)
             d[j]= d[j+1];
         d[7]= get_byte(pb);
@@ -701,7 +693,8 @@
         //parse ix##
         if(  (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams)
         //parse JUNK
-           ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')){
+           ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')
+           ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){
             url_fskip(pb, size);
 //av_log(NULL, AV_LOG_DEBUG, "SKIP\n");
             goto resync;