Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

[ffmpeg] / libavcodec / ituh263dec.c

diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 6d06a099e9814919a8ea54c5928379dd29dfbe11..08aeb30aeb75c58b3532ffa5af2e4025098c2f5b 100644 (file)
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -874,6 +874,10 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
 
     align_get_bits(&s->gb);
 
+    if (show_bits(&s->gb, 2) == 2 && s->avctx->frame_number == 0) {
+         av_log(s->avctx, AV_LOG_WARNING, "Header looks like RTP instead of H.263\n");
+    }
+
     startcode= get_bits(&s->gb, 22-8);
 
     for(i= get_bits_left(&s->gb); i>24; i-=8) {
@@ -1033,6 +1037,7 @@ int ff_h263_decode_picture_header(MpegEncContext *s)
                 height = ff_h263_format[format][1];
                 s->avctx->sample_aspect_ratio= (AVRational){12,11};
             }
+            s->avctx->sample_aspect_ratio.den <<= s->ehc_mode;
             if ((width == 0) || (height == 0))
                 return -1;
             s->width = width;