[Mplayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.3,1.4

Arpi of Ize arpi at mplayer.dev.hu
Sun Mar 31 22:27:54 CEST 2002


Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv18600

Modified Files:
	demux_ogg.c 
Log Message:
argh, some samples sue new header chunks - fixed

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demux_ogg.c	31 Mar 2002 20:17:27 -0000	1.3
+++ demux_ogg.c	31 Mar 2002 20:27:52 -0000	1.4
@@ -335,14 +335,18 @@
       if(strncmp(st->streamtype,"video",5) == 0) {
 	sh_v = new_sh_video(demuxer,ogg_d->num_sub);
 	sh_v->bih = (BITMAPINFOHEADER*)calloc(1,sizeof(BITMAPINFOHEADER));
+	sh_v->bih->biSize=sizeof(BITMAPINFOHEADER);
+	sh_v->bih->biCompression=
 	sh_v->format = mmioFOURCC(st->subtype[0],st->subtype[1],
 				  st->subtype[2],st->subtype[3]);
 	sh_v->frametime = st->time_unit*0.0000001;
 	sh_v->fps = 1/sh_v->frametime;
-	sh_v->bih->biSize = st->buffersize;
 	sh_v->bih->biBitCount = st->bits_per_sample;
 	sh_v->disp_w = sh_v->bih->biWidth = st->sh.video.width;
 	sh_v->disp_h = sh_v->bih->biHeight = st->sh.video.height;
+	if(!sh_v->bih->biBitCount) sh_v->bih->biBitCount=24; // hack, FIXME
+	sh_v->bih->biPlanes=1;
+	sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
 
 	ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps;
 	n_video++;




More information about the MPlayer-cvslog mailing list