[FFmpeg-cvslog] r20875 - trunk/ffmpeg.c

[cehoyos]

Author: cehoyos
Date: Tue Dec 15 21:36:14 2009
New Revision: 20875

Log:
Simplify freeing of audio_language and subtitle_language.
Patch by Matthieu, mcrapet gmail com

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Tue Dec 15 16:57:18 2009	(r20874)
+++ trunk/ffmpeg.c	Tue Dec 15 21:36:14 2009	(r20875)
@@ -3259,8 +3259,7 @@ static void new_audio_stream(AVFormatCon
     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(AVFormat
 
     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;