[FFmpeg-cvslog] Set palette for 1bit pcx.

Carl Eugen Hoyos git at videolan.org
Fri Nov 11 18:40:59 CET 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Nov 11 18:36:41 2011 +0100| [e22eff964f73d8b3f4b748088635c884c36d3ed9] | committer: Carl Eugen Hoyos

Set palette for 1bit pcx.

The stored palette contains zeroes only.
Fixes ticket #637.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e22eff964f73d8b3f4b748088635c884c36d3ed9
---

 libavcodec/pcx.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index b2d433a..851b205 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -224,6 +224,9 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     if (nplanes == 1 && bits_per_pixel == 8) {
         pcx_palette(&buf, (uint32_t *) p->data[1], 256);
+    } else if (bits_per_pixel * nplanes == 1) {
+        AV_WN32A(p->data[1]  , 0xFF000000);
+        AV_WN32A(p->data[1]+4, 0xFFFFFFFF);
     } else if (bits_per_pixel < 8) {
         const uint8_t *palette = bufstart+16;
         pcx_palette(&palette, (uint32_t *) p->data[1], 16);



More information about the ffmpeg-cvslog mailing list