diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-11 22:04:29 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-11 22:04:29 +0000 |
| commit | c0455325f03dfc7df4ecf53eb2182f18783f8e14 (patch) | |
| tree | 13dbfe5cc119e37afd1a24770c729cd3f0e939e5 /libmpdemux | |
| parent | d8b29c80d5ab6f0a7d406df58c99a707132e6b8a (diff) | |
| download | mpv-c0455325f03dfc7df4ecf53eb2182f18783f8e14.tar.bz2 mpv-c0455325f03dfc7df4ecf53eb2182f18783f8e14.tar.xz | |
Reindent after last commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27266 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mov.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index b244a3e402..6449c24c60 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1115,15 +1115,15 @@ static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) { 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); |