diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-15 01:58:18 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-15 01:58:18 +0000 |
commit | 853ab80ca315edb287315558d381084adbd97413 (patch) | |
tree | eb2661329193c1b1e56c43168015edae22f9a66e /libmpdemux/demux_mov.c | |
parent | f3d7b72f6c89f50ed46af5eabfaee725f9420522 (diff) | |
download | mpv-853ab80ca315edb287315558d381084adbd97413.tar.bz2 mpv-853ab80ca315edb287315558d381084adbd97413.tar.xz |
get aspect info from display size if != real size
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5629 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
-rw-r--r-- | libmpdemux/demux_mov.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index bd1121b36b..35fff04dfd 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -885,8 +885,12 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak if(!sh->disp_w && !sh->disp_h) { sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8); sh->disp_h=trak->tkdata[81]|(trak->tkdata[80]<<8); - } - + } else if(sh->disp_w!=(trak->tkdata[77]|(trak->tkdata[76]<<8))){ + // codec and display width differ... use display one for aspect + sh->aspect=trak->tkdata[77]|(trak->tkdata[76]<<8); + sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8); + } + if(depth&(~15)) printf("*** depht = 0x%X\n",depth); // palettized? |