RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Free track encodings on error or demuxer close 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20139 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-10-09 18:28:58 +00:00
parent a649e78529
commit 89ca5fd9b7
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libmpdemux/demux_mkv.c
View File

@ -704,6 +704,19 @@ demux_mkv_read_info (demuxer_t *demuxer)
return 0;
}
/**
* \brief free array of kv_content_encoding_t
* \param encodings pointer to array
* \param numencodings number of encodings in array
*/
static void
demux_mkv_free_encodings(mkv_content_encoding_t *encodings, int numencodings)
{
while (numencodings-- > 0)
free(encodings[numencodings].comp_settings);
free(encodings);
}
static int
demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
{
@ -742,21 +755,21 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
case MATROSKA_ID_CONTENTENCODINGORDER:
num = ebml_read_uint (s, &l);
if (num == EBML_UINT_INVALID)
return 0;
goto err_out;
e.order = num;
break;
case MATROSKA_ID_CONTENTENCODINGSCOPE:
num = ebml_read_uint (s, &l);
if (num == EBML_UINT_INVALID)
return 0;
goto err_out;
e.scope = num;
break;
case MATROSKA_ID_CONTENTENCODINGTYPE:
num = ebml_read_uint (s, &l);
if (num == EBML_UINT_INVALID)
return 0;
goto err_out;
e.type = num;
break;
@ -777,7 +790,7 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
case MATROSKA_ID_CONTENTCOMPALGO:
num = ebml_read_uint (s, &l);
if (num == EBML_UINT_INVALID)
return 0;
goto err_out;
e.comp_algo = num;
break;
@ -859,6 +872,10 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
track->encodings = ce;
track->num_encodings = n;
return len;
err_out:
demux_mkv_free_encodings(ce, n);
return 0;
}
static int
@ -2702,6 +2719,8 @@ demux_close_mkv (demuxer_t *demuxer)
if (mkv_d->tracks[i]->sh_sub.ass_track)
ass_free_track (mkv_d->tracks[i]->sh_sub.ass_track);
#endif
demux_mkv_free_encodings(mkv_d->tracks[i]->encodings,
mkv_d->tracks[i]->num_encodings);
}
for (i=0; i < SUB_MAX_TEXT; i++)
if (mkv_d->subs.text[i])