Ticket #191: demux_ogg.c.diff

File demux_ogg.c.diff, 1.9 KB (added by makovick@…, 22 years ago)

set correct disp_w & disp_h

  • libmpdemux/demux_ogg.c 

    RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.66
diff -u -u -r1.66 demux_ogg.c
     
    847847                (double)inf.fps_denominator;
    848848            sh_v->frametime = ((double)inf.fps_denominator)/
    849849                (double)inf.fps_numerator;
    850             sh_v->disp_w = sh_v->bih->biWidth = inf.width;
    851             sh_v->disp_h = sh_v->bih->biHeight = inf.height;
     850            sh_v->bih->biWidth = inf.width;
     851            sh_v->bih->biHeight = inf.height;
    852852            sh_v->bih->biBitCount = 24;
    853853            sh_v->bih->biPlanes = 3;
    854854            sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount/8) *
    … …  
    895895                                pack.packet[70],pack.packet[71]);
    896896        sh_v->frametime = get_uint64(pack.packet+164)*0.0000001;
    897897        sh_v->fps = 1/sh_v->frametime;
    898         sh_v->disp_w = sh_v->bih->biWidth = get_uint32(pack.packet+176);
    899         sh_v->disp_h = sh_v->bih->biHeight = get_uint32(pack.packet+180);
     898        sh_v->bih->biWidth = get_uint32(pack.packet+176);
     899        sh_v->bih->biHeight = get_uint32(pack.packet+180);
    900900        sh_v->bih->biBitCount = get_uint16(pack.packet+182);
    901901        if(!sh_v->bih->biBitCount) sh_v->bih->biBitCount=24; // hack, FIXME
    902902        sh_v->bih->biPlanes=1;
    … …  
    952952        sh_v->frametime = get_uint64(&st->time_unit)*0.0000001;
    953953        sh_v->fps = 1.0/sh_v->frametime;
    954954        sh_v->bih->biBitCount = get_uint16(&st->bits_per_sample);
    955         sh_v->disp_w = sh_v->bih->biWidth = get_uint32(&st->sh.video.width);
    956         sh_v->disp_h = sh_v->bih->biHeight = get_uint32(&st->sh.video.height);
     955        sh_v->bih->biWidth = get_uint32(&st->sh.video.width);
     956        sh_v->bih->biHeight = get_uint32(&st->sh.video.height);
    957957        if(!sh_v->bih->biBitCount) sh_v->bih->biBitCount=24; // hack, FIXME
    958958        sh_v->bih->biPlanes=1;
    959959        sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;