aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto Togni <r_togni@tiscali.it>2004-06-27 16:06:15 +0000
committerRoberto Togni <r_togni@tiscali.it>2004-06-27 16:06:15 +0000
commitf7a7c75c3de2b30084e1098d06f2df43355713dd (patch)
treef63c9456cd12b0688872a262dbc30c8329f30354
parentdab1c4c612ccb1a7e2ee72e13ca9f7754f0c9c97 (diff)
downloadffmpeg-f7a7c75c3de2b30084e1098d06f2df43355713dd.tar.gz
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
-rw-r--r--libavcodec/cinepak.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index df7aa0e480..3c560fdc5f 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 {