Revision f8af5cb5

View differences:

libavcodec/h263.c
1522 1522
    int vo_ver_id=1; //must be 2 if we want GMC or q-pel
1523 1523
    char buf[255];
1524 1524

  
1525
    s->vo_type= s->has_b_frames ? CORE_VO_TYPE : SIMPLE_VO_TYPE;
1525
    if(s->max_b_frames){
1526
        s->vo_type= ADV_SIMPLE_VO_TYPE;
1527
    }else{
1528
        s->vo_type= SIMPLE_VO_TYPE;
1529
    }
1526 1530

  
1527 1531
    put_bits(&s->pb, 16, 0);
1528 1532
    put_bits(&s->pb, 16, 0x100);        /* video obj */
libavcodec/mpeg4data.h
4 4
#define BIN_ONLY_SHAPE   2
5 5
#define GRAY_SHAPE       3
6 6

  
7
#define SIMPLE_VO_TYPE 1
8
#define CORE_VO_TYPE   3
7
#define SIMPLE_VO_TYPE             1
8
#define CORE_VO_TYPE               3
9
#define MAIN_VO_TYPE               4
10
#define NBIT_VO_TYPE               5
11
#define ARTS_VO_TYPE               10
12
#define ACE_VO_TYPE                12
13
#define ADV_SIMPLE_VO_TYPE         17
9 14

  
10 15
// aspect_ratio_info
11 16
#define EXTENDED_PAR 15
tests/ffmpeg.regression.ref
13 13
f7b3140fea7b70a5673061aebe547562 *./data/out.yuv
14 14
a180b84cc43ab6bed7796354385f00c1 *./data/a-odivx.avi
15 15
3a1463cf62c2bee9046870f34400494c *./data/out.yuv
16
d64b3c8a7e549b8e32c6101813ad2e02 *./data/a-mpeg4-rc.avi
16
50be55c7fbb9a7b05d51afe3004232ef *./data/a-mpeg4-rc.avi
17 17
f881bf7db273282791c18330bcae338d *./data/out.yuv
18 18
b517505ecd37c09656ae12646428da58 *./data/a-mpeg4-adv.avi
19 19
0147bab9d6971eb177457dd096ae8aaf *./data/out.yuv

Also available in: Unified diff