Avcodec: Fix potential dereference before null check

See CID #1223114

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 65c6773681345f1a6ce5e5addc6c044443bb23d5..4c09175471779f16fdc899178f3f1afefabda02b 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -855,12 +855,11 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
         if( p_sys->p_context->pix_fmt == PIX_FMT_PAL8 )
         {
             if( !p_pic->format.p_palette )
-            {
                 p_pic->format.p_palette = calloc( 1, sizeof(video_palette_t) );
-                p_pic->format.p_palette->i_entries = 256;
-            }
+
             if( p_pic->format.p_palette )
             {
+                p_pic->format.p_palette->i_entries = AVPALETTE_COUNT;
                 memcpy( p_pic->format.p_palette->palette, p_ff_pic->data[1], AVPALETTE_SIZE );
             }
         }