From 406629150cae78a15d7c04b049511b03740b6bfc Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Fri, 1 Apr 2011 23:23:28 +1100 Subject: DPX decoder: read sample aspect ratio Signed-off-by: Michael Niedermayer --- libavcodec/dpx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavcodec/dpx.c') diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 82891d6b42..0722dd07ef 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; -- cgit v1.2.3