diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-02-01 15:32:21 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-02-08 21:01:31 +0100 |
commit | 38d553322891c8e47182f05199d19888422167dc (patch) | |
tree | c65ae36daf4d68dfdbea62accc7f33630cc338f5 /libavcodec/imgconvert.c | |
parent | 8e37038a3458e6b55c9ebc28f077e2119a41b59e (diff) | |
download | ffmpeg-38d553322891c8e47182f05199d19888422167dc.tar.gz |
pixdesc: mark pseudopaletted formats with a special flag.
This makes it possible to dintinguish them from PAL8.
Fixes an invalid write in avpicture_layout().
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r-- | libavcodec/imgconvert.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index d90254ca76..90c9b7b255 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -471,15 +471,9 @@ int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height) AVPicture dummy_pict; if(av_image_check_size(width, height, 0, NULL)) return -1; - switch (pix_fmt) { - case PIX_FMT_RGB8: - case PIX_FMT_BGR8: - case PIX_FMT_RGB4_BYTE: - case PIX_FMT_BGR4_BYTE: - case PIX_FMT_GRAY8: + if (av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_PSEUDOPAL) // do not include palette for these pseudo-paletted formats return width * height; - } return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height); } |