[SCM] libav/experimental: Ignore palette for grayscale files, all my samples are inverted with default qt grayscale palette.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f7a7c75c3de2b30084e1098d06f2df43355713dd
Author: Roberto Togni <r_togni at tiscali.it>
Date:   Sun Jun 27 16:06:15 2004 +0000

    Ignore palette for grayscale files, all my samples are inverted with
    default qt grayscale palette.
    
    Originally committed as revision 3264 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index df7aa0e..3c560fd 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -365,7 +365,7 @@ static int cinepak_decode_init(AVCodecContext *avctx)
     s->height = (avctx->height + 3) & ~3;
 
     // check for paletted data
-    if (avctx->palctrl == NULL) {
+    if ((avctx->palctrl == NULL) || (avctx->bits_per_sample == 40)) {
         s->palette_video = 0;
         avctx->pix_fmt = PIX_FMT_YUV420P;
     } else {

-- 
Libav/FFmpeg packaging