highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove broken movi_end skip-hack-check

Browse Source 
this should fix seeking over the first riff chunk in odml

Originally committed as revision 10114 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-08-14 03:00:56 +00:00
parent ea4b2b5e2c
commit bc3a73bc87
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/avidec.c
View File

@ -674,14 +674,6 @@ resync:
for(i=sync=url_ftell(pb); !url_feof(pb); i++) { for(i=sync=url_ftell(pb); !url_feof(pb); i++) {
int j; 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++) for(j=0; j<7; j++)
d[j]= d[j+1]; d[j]= d[j+1];
d[7]= get_byte(pb); d[7]= get_byte(pb);
@ -701,7 +693,8 @@ resync:
//parse ix## //parse ix##
if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams)
//parse JUNK //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); url_fskip(pb, size);
//av_log(NULL, AV_LOG_DEBUG, "SKIP\n"); //av_log(NULL, AV_LOG_DEBUG, "SKIP\n");
goto resync; goto resync;