Mercurial > libavcodec.hg
changeset 923:3b5d9ecedc73 libavcodec
correct mpeg4 vo type
| author | michaelni |
|---|---|
| date | Mon, 09 Dec 2002 00:06:15 +0000 |
| parents | 5fa4d5007dfd |
| children | 3814e9115672 |
| files | h263.c mpeg4data.h |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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