RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dpx decoder: read sample aspect ratio 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2011-04-01 23:23:28 +11:00 committed by Michael Niedermayer
parent 4ce776d636
commit 1b5282a221
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dpx.c
View File

@ -68,7 +68,7 @@ static int decode_frame(AVCodecContext *avctx,
unsigned int rgbBuffer; unsigned int rgbBuffer;
if (avpkt->size <= 0x324) { if (avpkt->size <= 1634) {
av_log(avctx, AV_LOG_ERROR, "Packet too small for DPX header\n"); av_log(avctx, AV_LOG_ERROR, "Packet too small for DPX header\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -106,6 +106,10 @@ static int decode_frame(AVCodecContext *avctx,
avctx->bits_per_raw_sample = avctx->bits_per_raw_sample =
bits_per_color = buf[0]; 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) { switch (descriptor) {
case 51: // RGBA case 51: // RGBA
elements = 4; elements = 4;