Contribs: Update dvdnav to 5.0.1

[vlc] / modules / video_chroma / swscale.c

diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
index 7d6faf61d9a8aa80650b1e4bdf5ee46b6df6b956..8ce512c3e9f8c9d5f36675d77cdda5a00a9db2e2 100644 (file)
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -583,9 +583,13 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
     GetPixels( src, src_stride, p_src, i_plane_start, i_plane_count, b_swap_uvi );
     if( p_filter->fmt_in.video.i_chroma == VLC_CODEC_RGBP )
     {
+        video_palette_t *src_pal =
+            p_src->format.p_palette ?
+            p_src->format.p_palette :
+            p_filter->fmt_in.video.p_palette;
         memset( palette, 0, sizeof(palette) );
-        if( p_filter->fmt_in.video.p_palette )
-            memcpy( palette, p_filter->fmt_in.video.p_palette->palette,
+        if( src_pal )
+            memcpy( palette, src_pal->palette,
                     __MIN( sizeof(video_palette_t), AVPALETTE_SIZE ) );
         src[1] = palette;
         src_stride[1] = 4;