aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-12-09 00:06:15 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-12-09 00:06:15 +0000
commitf8af5cb5a40c7fb76760ecfe03556845a83fbfe6 (patch)
tree8271cb8e32c3ede6b4fa9a528eeb84cbaad543c6 /libavcodec
parent86689eeb7a72c50cf23b9ed414a3d2b51ebd5eab (diff)
downloadffmpeg-f8af5cb5a40c7fb76760ecfe03556845a83fbfe6.tar.gz
correct mpeg4 vo type
Originally committed as revision 1324 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263.c6
-rw-r--r--libavcodec/mpeg4data.h9
2 files changed, 12 insertions, 3 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 80c9a3adc8..80fcd13e19 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -1522,7 +1522,11 @@ static void mpeg4_encode_vol_header(MpegEncContext * s)
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 --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index ef612c2fa4..17c1942205 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -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