# HG changeset patch # User cehoyos # Date 1180362348 0 # Node ID 0d4b310c738b41ca3a00872aaae8f592d17a4618 # Parent 6f8db5d6bb2dd00366288ac30ea90353d6b9ae42 10l: r23399 broke mov/mp4 demuxing diff -r 6f8db5d6bb2d -r 0d4b310c738b libmpdemux/demux_mov.c --- a/libmpdemux/demux_mov.c Mon May 28 10:55:04 2007 +0000 +++ b/libmpdemux/demux_mov.c Mon May 28 14:25:48 2007 +0000 @@ -434,6 +434,7 @@ case MOV_FOURCC('r','m','d','a'): continue; case MOV_FOURCC('r','d','r','f'): { + int tmp=stream_read_dword(demuxer->stream); int type=stream_read_dword_le(demuxer->stream); int slen=stream_read_dword(demuxer->stream); //char* s=malloc(slen+1); @@ -454,6 +455,7 @@ len-=12+slen;i-=12+slen; break; } case MOV_FOURCC('r','m','d','r'): { + int flags=stream_read_dword(demuxer->stream); int rate=stream_read_dword(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V," min. data rate: %d bits/sec\n",rate); len-=8; i-=8; break; @@ -1636,9 +1638,12 @@ break; } case MOV_FOURCC('h','d','l','r'): { + unsigned int tmp = stream_read_dword(demuxer->stream); unsigned int type = stream_read_dword_le(demuxer->stream); unsigned int subtype = stream_read_dword_le(demuxer->stream); unsigned int manufact = stream_read_dword_le(demuxer->stream); + unsigned int comp_flags = stream_read_dword(demuxer->stream); + unsigned int comp_mask = stream_read_dword(demuxer->stream); int len = stream_read_char(demuxer->stream); char* str = malloc(len + 1); stream_read(demuxer->stream, str, len); @@ -1718,6 +1723,7 @@ break; } case MOV_FOURCC('s','t','t','s'): { + int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; unsigned int pts = 0; @@ -1776,6 +1782,7 @@ break; } case MOV_FOURCC('s','t','c','o'): { + int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -1792,6 +1799,7 @@ break; } case MOV_FOURCC('c','o','6','4'): { + int temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V,