[FFmpeg-cvslog] Support reading 64bit dpx images.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jan 14 01:15:42 2012 +0100| [dd55adb1a704983482e3839a3a509d416d84d36a] | committer: Carl Eugen Hoyos

Support reading 64bit dpx images.

Reviewed-by: Jean First

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

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

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index e8dae30..8a30ca6 100644
--- 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: