github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-07 01:47:00 +01:00
Code Releases Activity

Check size of tkdata before using it in mov demuxer.

Browse Source 
Fixes bug #1170 and others.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27265 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-07-11 22:03:01 +00:00
parent 49ddf2e0f5
commit d8b29c80d5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/demux_mov.c
View File

@ -1114,6 +1114,7 @@ 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);
@ -1123,6 +1124,7 @@ static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) {
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);