[MPlayer-cvslog] r23399

Bill Song dev at fastreaming.com
Mon May 28 14:02:48 CEST 2007


Dear :

I think the following modifications should be wrong!
They break the header parser

Am I silly?

Modified: trunk/libmpdemux/demux_mov.c
>
> ==============================================================================
> --- trunk/libmpdemux/demux_mov.c        (original)
> +++ trunk/libmpdemux/demux_mov.c        Mon May 28 10:42:35 2007
> @@ -434,7 +434,6 @@ static int mov_check_file(demuxer_t* dem
>                   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);
> @@ -455,7 +454,6 @@ static int mov_check_file(demuxer_t* dem
>                       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;
> @@ -1638,12 +1636,9 @@ static int lschunks_intrak(demuxer_t* de
>        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);
> @@ -1723,7 +1718,6 @@ static int lschunks_intrak(demuxer_t* de
>        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;
> @@ -1782,7 +1776,6 @@ static int lschunks_intrak(demuxer_t* de
>        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,
> @@ -1799,7 +1792,6 @@ static int lschunks_intrak(demuxer_t* de
>        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,
>
>



More information about the MPlayer-cvslog mailing list