aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dpx.c
diff options
context:
space:
mode:
authorJérôme Martinez <jerome@mediaarea.net>2018-06-01 10:09:01 +0200
committerPaul B Mahol <onemda@gmail.com>2018-06-01 11:25:23 +0200
commit5205b3289e46b680c314e44a9243929b6d00146a (patch)
treee58077c3b74061029308ac255268e8aa7b9fe1a6 /libavcodec/dpx.c
parent0d35413e5dbe304bafbe48b1057785ced44de71f (diff)
downloadffmpeg-5205b3289e46b680c314e44a9243929b6d00146a.tar.gz
avcodec/dpx: Support for RGBA 12-bit packed decoding
Limited to widths multiple of 2 due to lack of test files for such corner case This partially fixes ticket #5639
Diffstat (limited to 'libavcodec/dpx.c')
-rw-r--r--libavcodec/dpx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 026fb10e90..fb388b6e52 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -237,6 +237,9 @@ static int decode_frame(AVCodecContext *avctx,
if (descriptor == 50 && endian && (avctx->width%8) == 0) { // Little endian and widths not a multiple of 8 need tests
tested = 1;
}
+ if (descriptor == 51 && endian && (avctx->width%2) == 0) { // Little endian and widths not a multiple of 2 need tests
+ tested = 1;
+ }
if (!tested) {
av_log(avctx, AV_LOG_ERROR, "Packing to 16bit required\n");
return -1;