* modules/stream_out/transcode.c: fixed mem leak + use av_free() instead of free...

* modules/codec/ffmpeg/*: use av_free() instead of free() where necessary.

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index 5fda89bc367bd5c68ae602438defd17cfed45f15..839daec56de3b0cf5cfa013fbd569d3762c61e1c 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -752,12 +752,12 @@ void E_(CloseEncoder)( vlc_object_t *p_this )
             vlc_object_destroy( pp_contexts[i] );
         }
 
-        free(pp_contexts);
+        free( pp_contexts );
     }
 #endif
 
     avcodec_close( p_sys->p_context );
-    free( p_sys->p_context );
+    av_free( p_sys->p_context );
 
     if( p_sys->p_buffer ) free( p_sys->p_buffer );
     if( p_sys->p_buffer_out ) free( p_sys->p_buffer_out );

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index f50b5c90edacfedfa5e527a2cbef638735cf8cb8..676b9af54ae6517d9a45e8fde29ae3804d1c4bc2 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -214,7 +214,7 @@ static void CloseDecoder( vlc_object_t *p_this )
 
         avcodec_close( p_sys->p_context );
         msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec );
-        free( p_sys->p_context );
+        av_free( p_sys->p_context );
     }
 
     switch( p_sys->i_cat )

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index f85b7a938c87fae99890347b436a8604e96e0e4a..12b3b591328b7e1c998cbc35687f95b24d636896 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -826,11 +826,8 @@ static int transcode_audio_ffmpeg_new( sout_stream_t *p_stream,
 static void transcode_audio_ffmpeg_close( sout_stream_t *p_stream,
                                           sout_stream_id_t *id )
 {
-    if( id->ff_dec )
-    {
-        avcodec_close( id->ff_dec_c );
-        free( id->ff_dec_c );
-    }
+    if( id->ff_dec ) avcodec_close( id->ff_dec_c );
+    av_free( id->ff_dec_c );
 
     module_Unneed( id->p_encoder, id->p_encoder->p_module );
     vlc_object_destroy( id->p_encoder );
@@ -1334,11 +1331,8 @@ static void transcode_video_ffmpeg_close ( sout_stream_t *p_stream,
     }
 
     /* Close decoder */
-    if( id->ff_dec )
-    {
-        avcodec_close( id->ff_dec_c );
-        free( id->ff_dec_c );
-    }
+    if( id->ff_dec ) avcodec_close( id->ff_dec_c );
+    av_free( id->ff_dec_c );
 
     /* Close encoder */
     if( id->p_encoder->p_module )