From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 9 Jun 2011 20:29:40 +0000 (+0200)
Subject: intelh263dec: fix "Strict H.263 compliance"  file playback
X-Git-Tag: v0.7rc1~58
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95a05030ca73076a8e5127e69596ade5964af60b;p=coroid%2Flibav_saccubus.git

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

fixes issue2449

patch submitted by xvid_fan freenet de
---

diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index c3d4d2687..b60608cd3 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -46,7 +46,7 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
     skip_bits1(&s->gb);         /* freeze picture release off */
 
     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");
         return -1;
     }
@@ -64,7 +64,10 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
     s->obmc= 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);
         if(format == 0 || format == 7){
             av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n");