]> git.sesse.net Git - vlc/commitdiff
avcodec: free p_sys->p_ff_pic in some error paths
authorJean-Paul Saman <jpsaman@videolan.org>
Wed, 3 Jun 2009 21:00:36 +0000 (23:00 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Mon, 15 Jun 2009 12:47:27 +0000 (14:47 +0200)
(cherry picked from commit 8a7520b350fb4eefa1a28ed43ac9dd7aca5b16c4)

Signed-off-by: Derk-Jan Hartman <hartman@videolan.org>
modules/codec/avcodec/video.c

index ca5de1a0b982f17fd5c364f9d0ec85151f5ab61e..eb93e1f4f7128095a945887c698ec2f2cdafd239 100644 (file)
@@ -349,6 +349,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     p_sys->p_buffer_orig = p_sys->p_buffer = malloc( p_sys->i_buffer_orig );
     if( !p_sys->p_buffer_orig )
     {
+        av_free( p_sys->p_ff_pic );
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -399,6 +400,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     if( ffmpeg_OpenCodec( p_dec ) < 0 )
     {
         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+        av_free( p_sys->p_ff_pic );
         free( p_sys->p_buffer_orig );
         free( p_sys );
         return VLC_EGENERIC;