# HG changeset patch
# User michaelni
# Date 1039392375 0
# Node ID 3b5d9ecedc73fc69cdf6b0ef7c40c01123b595e9
# Parent  5fa4d5007dfdc03125019377a134ad25cd139a8b
correct mpeg4 vo type

diff -r 5fa4d5007dfd -r 3b5d9ecedc73 h263.c
--- a/h263.c	Sun Dec 08 21:29:37 2002 +0000
+++ b/h263.c	Mon Dec 09 00:06:15 2002 +0000
@@ -1522,7 +1522,11 @@
     int vo_ver_id=1; //must be 2 if we want GMC or q-pel
     char buf[255];
 
-    s->vo_type= s->has_b_frames ? CORE_VO_TYPE : SIMPLE_VO_TYPE;
+    if(s->max_b_frames){
+        s->vo_type= ADV_SIMPLE_VO_TYPE;
+    }else{
+        s->vo_type= SIMPLE_VO_TYPE;
+    }
 
     put_bits(&s->pb, 16, 0);
     put_bits(&s->pb, 16, 0x100);        /* video obj */
diff -r 5fa4d5007dfd -r 3b5d9ecedc73 mpeg4data.h
--- a/mpeg4data.h	Sun Dec 08 21:29:37 2002 +0000
+++ b/mpeg4data.h	Mon Dec 09 00:06:15 2002 +0000
@@ -4,8 +4,13 @@
 #define BIN_ONLY_SHAPE   2
 #define GRAY_SHAPE       3
 
-#define SIMPLE_VO_TYPE 1
-#define CORE_VO_TYPE   3
+#define SIMPLE_VO_TYPE             1
+#define CORE_VO_TYPE               3
+#define MAIN_VO_TYPE               4
+#define NBIT_VO_TYPE               5
+#define ARTS_VO_TYPE               10
+#define ACE_VO_TYPE                12
+#define ADV_SIMPLE_VO_TYPE         17
 
 // aspect_ratio_info
 #define EXTENDED_PAR 15