[FFmpeg-cvslog] dpxdec: Fix decoding of RGBA10

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  7 21:24:06 2013 +0200| [2f284c017000065539b5ab7183a3f8140c69dfb2] | committer: Michael Niedermayer

dpxdec: Fix decoding of RGBA10

Fixes Ticket2392

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/dpx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 0d60a7e..2fd5bdc 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -152,7 +152,7 @@ static int decode_frame(AVCodecContext *avctx,
                 return -1;
             }
             avctx->pix_fmt = AV_PIX_FMT_GBRP10;
-            total_size = (avctx->width * avctx->height * elements + 2) / 3 * 4;
+            total_size = (avctx->width * elements + 2) / 3 * 4 * avctx->height;
             break;
         case 12:
             if (!packing) {
@@ -210,6 +210,7 @@ static int decode_frame(AVCodecContext *avctx,
                     read10in32(&buf, &rgbBuffer,
                                &n_datum, endian);
             }
+            n_datum = 0;
             for (i = 0; i < 3; i++)
                 ptr[i] += p->linesize[i];
         }