Mercurial > mplayer.hg

changeset 9575:5c18b20924e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Animatrix AAC fix, patch by <dimakar(at)yahoo.com>
author rtognimp
date Wed, 12 Mar 2003 22:59:04 +0000
parents eada4280c3fa
children bc2b0f1ed904
files libmpdemux/demux_mov.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Wed Mar 12 18:11:40 2003 +0000
+++ b/libmpdemux/demux_mov.c	Wed Mar 12 22:59:04 2003 +0000
@@ -601,7 +601,10 @@
 		    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 @@
 			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;