Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi

Browse source 
Originally committed as revision 5085 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-03-01 12:04:22 +00:00
parent 5c89153e90
commit 1894edeb74
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libavformat/avidec.c
View file

@ -203,7 +203,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* using frame_period is bad idea */ /* using frame_period is bad idea */
frame_period = get_le32(pb); frame_period = get_le32(pb);
bit_rate = get_le32(pb) * 8; bit_rate = get_le32(pb) * 8;
url_fskip(pb, 4 * 4); get_le32(pb);
avi->non_interleaved |= get_le32(pb) & AVIF_MUSTUSEINDEX;
url_fskip(pb, 2 * 4);
n = get_le32(pb); n = get_le32(pb);
for(i=0;i<n;i++) { for(i=0;i<n;i++) {
AVIStream *ast; AVIStream *ast;
@ -468,13 +471,12 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
if(i>=0){ if(i>=0){
int64_t pos= best_st->index_entries[i].pos; int64_t pos= best_st->index_entries[i].pos;
pos += best_ast->packet_size - best_ast->remaining; pos += best_ast->packet_size - best_ast->remaining;
url_fseek(&s->pb, pos, SEEK_SET); url_fseek(&s->pb, pos + 8, SEEK_SET);
// av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos); // av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos);
if(best_ast->remaining) avi->stream_index= best_stream_index;
avi->stream_index= best_stream_index; if(!best_ast->remaining)
else best_ast->remaining= best_st->index_entries[i].size;
avi->stream_index= -1;
} }
} }