Mercurial > mplayer.hg

comparison libmpdemux/demux_mov.c @ 27234:fe1be13f3aed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reindent after last commit
author reimar
date Fri, 11 Jul 2008 22:04:29 +0000
parents 8c5ec96a0bc7
children f45c38163037
comparison
equal deleted inserted replaced
27233:8c5ec96a0bc7 27234:fe1be13f3aed
1113 sh->frametime=1.0f/sh->fps; 1113 sh->frametime=1.0f/sh->fps;
1114 1114
1115 sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8); 1115 sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8);
1116 sh->disp_h=trak->stdata[27]|(trak->stdata[26]<<8); 1116 sh->disp_h=trak->stdata[27]|(trak->stdata[26]<<8);
1117 if(trak->tkdata_len>81) { 1117 if(trak->tkdata_len>81) {
1118 // if image size is zero, fallback to display size 1118 // if image size is zero, fallback to display size
1119 if(!sh->disp_w && !sh->disp_h) { 1119 if(!sh->disp_w && !sh->disp_h) {
1120 sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8); 1120 sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8);
1121 sh->disp_h=trak->tkdata[81]|(trak->tkdata[80]<<8); 1121 sh->disp_h=trak->tkdata[81]|(trak->tkdata[80]<<8);
1122 } else if(sh->disp_w!=(trak->tkdata[77]|(trak->tkdata[76]<<8))){ 1122 } else if(sh->disp_w!=(trak->tkdata[77]|(trak->tkdata[76]<<8))){
1123 // codec and display width differ... use display one for aspect 1123 // codec and display width differ... use display one for aspect
1124 sh->aspect=trak->tkdata[77]|(trak->tkdata[76]<<8); 1124 sh->aspect=trak->tkdata[77]|(trak->tkdata[76]<<8);
1125 sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8); 1125 sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8);
1126 } 1126 }
1127 } 1127 }
1128 1128
1129 if(depth>32+8) mp_msg(MSGT_DEMUX, MSGL_INFO,"*** depth = 0x%X\n",depth); 1129 if(depth>32+8) mp_msg(MSGT_DEMUX, MSGL_INFO,"*** depth = 0x%X\n",depth);
1130 1130
1131 // palettized? 1131 // palettized?