From: Derk-Jan Hartman <hartman@videolan.org>
Date: Fri, 9 Jan 2004 02:28:30 +0000 (+0000)
Subject: * video.c: gibalou: no palctrl in avcodec context in 0.4.8
X-Git-Tag: 0.7.1~561
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7c300ccaf9ca12623f57eeee4fae610da14aa87d;p=vlc

* video.c: gibalou: no palctrl in avcodec context in 0.4.8
* ffmpeg.c: 0.4.8 ifdef'ing
---

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 3fd55b5440..a111155efb 100644
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.75 2004/01/09 00:02:55 gbazin Exp $
+ * $Id: ffmpeg.c,v 1.76 2004/01/09 02:28:30 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -437,10 +437,12 @@ static struct
     /* Flash (H263) variant */
     { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1,
       VIDEO_ES, "Flash Video" },
+
 #if LIBAVCODEC_BUILD > 4680
     { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC,
       VIDEO_ES, "Flic Video" },
 #endif
+
     /* MJPEG */
     { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG,
       VIDEO_ES, "Motion JPEG Video" },
@@ -460,8 +462,10 @@ static struct
     { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB, /* for mov file */
       VIDEO_ES, "Motion JPEG B Video" },
 
+#if LIBAVCODEC_BUILD > 4680
     { VLC_FOURCC( 'S', 'P', '5', 'X' ), CODEC_ID_SP5X,
       VIDEO_ES, "Sunplus Motion JPEG Video" },
+#endif
 
     /* DV */
     { VLC_FOURCC('d','v','s','l'), CODEC_ID_DVVIDEO,
diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c
index cad8c207a5..4704b979b2 100644
--- a/modules/codec/ffmpeg/video.c
+++ b/modules/codec/ffmpeg/video.c
@@ -2,7 +2,7 @@
  * video.c: video decoder using the ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video.c,v 1.59 2004/01/09 00:02:55 gbazin Exp $
+ * $Id: video.c,v 1.60 2004/01/09 02:28:30 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -336,7 +336,9 @@ int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context,
     p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
 
     /* Setup dummy palette to avoid segfaults with some codecs */
+#if LIBAVCODEC_BUILD >= 4688
     p_sys->p_context->palctrl = &palette_control;
+#endif
 
     /* ***** Open the codec ***** */
     vlc_mutex_lock( lockval.p_address );