diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-12 22:59:04 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-12 22:59:04 +0000 |
| commit | b0bbf9c76680cd2a5943a59184ba0b2bcd4662fa (patch) | |
| tree | 4a83399fdbe41c31871984dd4406c2ba681fb225 /libmpdemux | |
| parent | 48272e2aa52cc0273ce4f113a02a1b6959428271 (diff) | |
| download | mpv-b0bbf9c76680cd2a5943a59184ba0b2bcd4662fa.tar.bz2 mpv-b0bbf9c76680cd2a5943a59184ba0b2bcd4662fa.tar.xz | |
Animatrix AAC fix, patch by <dimakar(at)yahoo.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9576 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mov.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index d5ab8457b9..c181e8df6c 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -601,7 +601,10 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak unsigned int fourcc=stream_read_dword_le(demuxer->stream); if(len<8) break; // error mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*s desc #%d: %.4s (%d bytes)\n",level,"",i,&fourcc,len-16); - if(!i){ + if(fourcc!=trak->fourcc && i) + mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVvariableFourCC); +// if(!i) + { trak->fourcc=fourcc; // read type specific (audio/video/time/text etc) header // NOTE: trak type is not yet known at this point :((( @@ -609,8 +612,6 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak trak->stdata=malloc(trak->stdata_len); stream_read(demuxer->stream,trak->stdata,trak->stdata_len); } - if(fourcc!=trak->fourcc && i) - mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVvariableFourCC); if(!stream_seek(demuxer->stream,pos+len)) break; } break; |