aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMatthieu Crapet <mcrapet@gmail.com>2009-12-15 20:36:14 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-12-15 20:36:14 +0000
commite6db28ceb246978243e9e5778a49f58bcf6abf80 (patch)
treedf0b8a15466c45f3bf62d3c8ac828701717da059 /ffmpeg.c
parent257c7147e1fde196a3f649af6003eff8ddba787f (diff)
downloadffmpeg-e6db28ceb246978243e9e5778a49f58bcf6abf80.tar.gz
Simplify freeing of audio_language and subtitle_language.
Patch by Matthieu, mcrapet gmail com Originally committed as revision 20875 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2ee65b5d0e..652082e894 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3259,8 +3259,7 @@ static void new_audio_stream(AVFormatContext *oc)
audio_enc->time_base= (AVRational){1, audio_sample_rate};
if (audio_language) {
av_metadata_set(&st->metadata, "language", audio_language);
- av_free(audio_language);
- audio_language = NULL;
+ av_freep(&audio_language);
}
/* reset some key parameters */
@@ -3301,8 +3300,7 @@ static void new_subtitle_stream(AVFormatContext *oc)
if (subtitle_language) {
av_metadata_set(&st->metadata, "language", subtitle_language);
- av_free(subtitle_language);
- subtitle_language = NULL;
+ av_freep(&subtitle_language);
}
subtitle_disable = 0;