Mercurial > mplayer.hg
changeset 27234:fe1be13f3aed
Reindent after last commit
| author | reimar |
|---|---|
| date | Fri, 11 Jul 2008 22:04:29 +0000 |
| parents | 8c5ec96a0bc7 |
| children | ea35e46aa7af |
| files | libmpdemux/demux_mov.c |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c Fri Jul 11 22:03:01 2008 +0000 +++ b/libmpdemux/demux_mov.c Fri Jul 11 22:04:29 2008 +0000 @@ -1115,15 +1115,15 @@ sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8); sh->disp_h=trak->stdata[27]|(trak->stdata[26]<<8); if(trak->tkdata_len>81) { - // if image size is zero, fallback to display size - 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 image size is zero, fallback to display size + 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>32+8) mp_msg(MSGT_DEMUX, MSGL_INFO,"*** depth = 0x%X\n",depth);