opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 21:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't need to check for NULL before av_free().

Browse Source 
And don't need to memset(0) the no more used priv_data.

Originally committed as revision 6925 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2006-11-06 23:57:34 +00:00
parent ae17bf6ac8
commit ce99efc6ff
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroska.c
View File

@ -2609,11 +2609,8 @@ matroska_read_close (AVFormatContext *s)
MatroskaDemuxContext *matroska = s->priv_data; MatroskaDemuxContext *matroska = s->priv_data;
int n = 0; int n = 0;
if (matroska->writing_app)
av_free(matroska->writing_app); av_free(matroska->writing_app);
if (matroska->muxing_app)
av_free(matroska->muxing_app); av_free(matroska->muxing_app);
if (matroska->index)
av_free(matroska->index); av_free(matroska->index);
if (matroska->packets != NULL) { if (matroska->packets != NULL) {
@ -2626,22 +2623,15 @@ matroska_read_close (AVFormatContext *s)
for (n = 0; n < matroska->num_tracks; n++) { for (n = 0; n < matroska->num_tracks; n++) {
MatroskaTrack *track = matroska->tracks[n]; MatroskaTrack *track = matroska->tracks[n];
if (track->codec_id)
av_free(track->codec_id); av_free(track->codec_id);
if (track->codec_name)
av_free(track->codec_name); av_free(track->codec_name);
if (track->codec_priv)
av_free(track->codec_priv); av_free(track->codec_priv);
if (track->name)
av_free(track->name); av_free(track->name);
if (track->language)
av_free(track->language); av_free(track->language);
av_free(track); av_free(track);
} }
memset(matroska, 0, sizeof(MatroskaDemuxContext));
return 0; return 0;
} }