diff h263dec.c @ 747:3d4377531f6c libavcodec

mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
author michaelni
date Mon, 14 Oct 2002 12:21:54 +0000
parents 25d7fb7c89be
children 4adadf210b3b
line wrap: on
line diff
--- a/h263dec.c	Sun Oct 13 19:53:32 2002 +0000
+++ b/h263dec.c	Mon Oct 14 12:21:54 2002 +0000
@@ -40,8 +40,6 @@
 }
 #endif
 
-const UINT16 ff_mpeg4_resync_prefix[8];
-
 static int h263_decode_init(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
@@ -313,7 +311,14 @@
     if (s->h263_msmpeg4) {
         ret = msmpeg4_decode_picture_header(s);
     } else if (s->h263_pred) {
-        ret = mpeg4_decode_picture_header(s);
+        if(s->avctx->extradata_size && s->picture_number==0){
+            GetBitContext gb;
+            
+            init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size);
+            ret = ff_mpeg4_decode_picture_header(s, &gb);
+        }
+        ret = ff_mpeg4_decode_picture_header(s, &s->gb);
+
         s->has_b_frames= !s->low_delay;
     } else if (s->h263_intel) {
         ret = intel_h263_decode_picture_header(s);