Commit 95a05030 authored by Anton Khirnov's avatar Anton Khirnov

intelh263dec: fix "Strict H.263 compliance" file playback

fixes issue2449

patch submitted by xvid_fan freenet de
parent c673c905
...@@ -46,7 +46,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) ...@@ -46,7 +46,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
skip_bits1(&s->gb); /* freeze picture release off */ skip_bits1(&s->gb); /* freeze picture release off */
format = get_bits(&s->gb, 3); format = get_bits(&s->gb, 3);
if (format != 7) { if (format == 0 || format == 6) {
av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n"); av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n");
return -1; return -1;
} }
...@@ -64,7 +64,10 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) ...@@ -64,7 +64,10 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
s->obmc= get_bits1(&s->gb); s->obmc= get_bits1(&s->gb);
s->pb_frame = get_bits1(&s->gb); s->pb_frame = get_bits1(&s->gb);
if(format == 7){ if (format < 6) {
s->width = h263_format[format][0];
s->height = h263_format[format][1];
} else {
format = get_bits(&s->gb, 3); format = get_bits(&s->gb, 3);
if(format == 0 || format == 7){ if(format == 0 || format == 7){
av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n"); av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment