[FFmpeg-cvslog] DPX decoder: read sample aspect ratio

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Apr  1 23:23:28 2011 +1100| [406629150cae78a15d7c04b049511b03740b6bfc] | committer: Reinhard Tartler

DPX decoder: read sample aspect ratio

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

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

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

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 82891d6..0722dd0 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -68,7 +68,7 @@ static int decode_frame(AVCodecContext *avctx,
 
     unsigned int rgbBuffer;
 
-    if (avpkt->size <= 0x324) {
+    if (avpkt->size <= 1634) {
         av_log(avctx, AV_LOG_ERROR, "Packet too small for DPX header\n");
         return AVERROR_INVALIDDATA;
     }
@@ -106,6 +106,10 @@ static int decode_frame(AVCodecContext *avctx,
     avctx->bits_per_raw_sample =
     bits_per_color = buf[0];
 
+    buf += 825;
+    avctx->sample_aspect_ratio.num = read32(&buf, endian);
+    avctx->sample_aspect_ratio.den = read32(&buf, endian);
+
     switch (descriptor) {
         case 51: // RGBA
             elements = 4;