Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dpx.c

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index e8dae300e588b093bb3c19ef652b6ecf1f077f1d..8a30ca6dffe732fdba8c47d954f8e6d9a511e281 100644 (file)
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -140,11 +140,11 @@ static int decode_frame(AVCodecContext *avctx,
         case 12:
         case 16:
             if (endian) {
-                avctx->pix_fmt = PIX_FMT_RGB48BE;
+                avctx->pix_fmt = elements == 4 ? PIX_FMT_RGBA64BE : PIX_FMT_RGB48BE;
             } else {
-                avctx->pix_fmt = PIX_FMT_RGB48LE;
+                avctx->pix_fmt = elements == 4 ? PIX_FMT_RGBA64LE : PIX_FMT_RGB48LE;
             }
-            target_packet_size = 6;
+            target_packet_size =
             source_packet_size = elements * 2;
             break;
         default: