Revision 70ac76c0

View differences:

libavcodec/avcodec.h
5 5

  
6 6
#define LIBAVCODEC_VERSION_INT 0x000406
7 7
#define LIBAVCODEC_VERSION     "0.4.6"
8
#define LIBAVCODEC_BUILD       4650
9
#define LIBAVCODEC_BUILD_STR   "4650"
8
#define LIBAVCODEC_BUILD       4651
9
#define LIBAVCODEC_BUILD_STR   "4651"
10 10

  
11 11
enum CodecID {
12 12
    CODEC_ID_NONE, 
......
147 147
#define CODEC_FLAG_LOW_DELAY      0x00080000 /* force low delay / will fail on b frames */
148 148
#define CODEC_FLAG_ALT_SCAN       0x00100000 /* use alternate scan */
149 149
#define CODEC_FLAG_TRELLIS_QUANT  0x00200000 /* use trellis quantization */
150
#define CODEC_FLAG_GLOBAL_HEADER  0x00400000 /* place global headers in extradata instead of every keyframe */
150 151

  
151 152
/* codec capabilities */
152 153

  
......
894 895
     * decoding: unused
895 896
     */
896 897
    int last_predictor_count;
897
    
898

  
898 899
    /**
899 900
     * pre pass for motion estimation
900 901
     * encoding: set by user.
......
902 903
     */
903 904
    int pre_me;
904 905

  
906
    /**
907
     * motion estimation pre pass compare function
908
     * encoding: set by user.
909
     * decoding: unused
910
     */
911
    int me_pre_cmp;
912
    
913
    /**
914
     * ME pre pass diamond size & shape
915
     * encoding: set by user.
916
     * decoding: unused
917
     */
918
    int pre_dia_size;
919

  
905 920
} AVCodecContext;
906 921

  
907 922
typedef struct AVCodec {
libavcodec/h263.c
1727 1727
    int time_div, time_mod;
1728 1728
    
1729 1729
    if(s->pict_type==I_TYPE){
1730
        if(picture_number - s->last_vo_picture_number >= 300 || picture_number==0){
1730
        if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){
1731 1731
            mpeg4_encode_visual_object_header(s);
1732 1732
            mpeg4_encode_vol_header(s, 0, 0);
1733

  
1734
            s->last_vo_picture_number= picture_number;
1735 1733
        }
1736 1734
        mpeg4_encode_gop_header(s);
1737 1735
    }
libavcodec/mpegvideo.h
443 443
    INT8 (*field_select_table)[2];   /* wtf, no really another table for interlaced b frames */
444 444
    int t_frame;                     /* time distance of first I -> B, used for interlaced b frames */
445 445
    int padding_bug_score;           /* used to detect the VERY common padding bug in MPEG4 */
446
    int last_vo_picture_number;      /* last picture number for which we added a VOS/VO/VOL header */
447 446

  
448 447
    /* divx specific, used to workaround (many) bugs in divx5 */
449 448
    int divx_version;
tests/ffmpeg.regression.ref
11 11
f3bc40b0a09eb06504fa5b51eb9135ee *./data/out.yuv
12 12
a11e0b741fa3c7fc491fb58ab8f7ca8d *./data/a-h263p.avi
13 13
615e3db2bdc535ca5b17996b29cabf24 *./data/out.yuv
14
466e2365c9027dea8695cf205adf3b9d *./data/a-odivx.avi
14
67a4922527e2341d11d6a61c79b497e5 *./data/a-odivx.avi
15 15
3ede54eadc97f43b4ab260faeb5e8674 *./data/out.yuv
16
5811f89254bc1f59528247f3daf11c1f *./data/a-mpeg4-rc.avi
16
4fdf373ede0785cc381687b8f1b207d4 *./data/a-mpeg4-rc.avi
17 17
d34057ff0806320c8be54fe34210c937 *./data/out.yuv
18
d0c2e8f437f0a08470764e1f12dd1ec6 *./data/a-mpeg4-adv.avi
19
1a2795985b820b4ed5064abf4187fd9a *./data/out.yuv
18
2abefdb7650d076021ad455cc5ef040e *./data/a-mpeg4-adv.avi
19
a26abb66bf9c5f5df3ab971dfdf1189d *./data/out.yuv
20 20
2846c8e3d97d7395eb746bfce44e0443 *./data/a-mjpeg.avi
21 21
278033451d7a6bfeb8339abbe4228499 *./data/out.yuv
22 22
b5f5efce96150d5cc8f5af8024ae3688 *./data/a-rv10.rm

Also available in: Unified diff