highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intelh263dec: aspect ratio processing fix.

Browse Source 
patch submitted by xvid_fan freenet de
This commit is contained in:
Anton Khirnov
2011-06-09 22:36:31 +02:00
parent 95a05030ca
commit 8e84c072e4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/intelh263dec.c
View File

@@ -67,6 +67,8 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
if (format < 6) { if (format < 6) {
s->width = h263_format[format][0]; s->width = h263_format[format][0];
s->height = h263_format[format][1]; s->height = h263_format[format][1];
s->avctx->sample_aspect_ratio.num = 12;
s->avctx->sample_aspect_ratio.den = 11;
} else { } else {
format = get_bits(&s->gb, 3); format = get_bits(&s->gb, 3);
if(format == 0 || format == 7){ if(format == 0 || format == 7){
@@ -91,9 +93,13 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
skip_bits1(&s->gb); skip_bits1(&s->gb);
skip_bits(&s->gb, 9); // display height skip_bits(&s->gb, 9); // display height
if(ar == 15){ if(ar == 15){
skip_bits(&s->gb, 8); // aspect ratio - width s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 8); // aspect ratio - width
skip_bits(&s->gb, 8); // aspect ratio - height s->avctx->sample_aspect_ratio.den = get_bits(&s->gb, 8); // aspect ratio - height
} else {
s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[ar];
} }
if (s->avctx->sample_aspect_ratio.num == 0)
av_log(s->avctx, AV_LOG_ERROR, "Invalid aspect ratio.\n");
} }
s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);