Mercurial > mplayer.hg

comparison libmpdemux/aviheader.c @ 25201:f2036002cac3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set sh_video->format when parsing aviheader, otherwise it might never be set correctly when using demux_demuxers (like with ogg stream in AVI).
author reimar
date Sat, 01 Dec 2007 14:29:53 +0000
parents 50159082a80b
children d643e4643313
comparison
equal deleted inserted replaced
25200:3f59c69ec31c 25201:f2036002cac3
272 sh_video->bih->biSize=chunksize; 272 sh_video->bih->biSize=chunksize;
273 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih,MSGL_V); 273 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_video->bih,MSGL_V);
274 chunksize=0; 274 chunksize=0;
275 sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; 275 sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
276 sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; 276 sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
277 sh_video->format = sh_video->bih->biCompression;
277 // if(demuxer->video->id==-1) demuxer->video->id=stream_id; 278 // if(demuxer->video->id==-1) demuxer->video->id=stream_id;
278 // IdxFix: 279 // IdxFix:
279 idxfix_videostream=stream_id; 280 idxfix_videostream=stream_id;
280 switch(sh_video->bih->biCompression){ 281 switch(sh_video->bih->biCompression){
281 case mmioFOURCC('M', 'P', 'G', '4'): 282 case mmioFOURCC('M', 'P', 'G', '4'):