Revision 029911d1 libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
15 15

  
16 16
#define LIBAVCODEC_VERSION_INT 0x000406
17 17
#define LIBAVCODEC_VERSION     "0.4.6"
18
#define LIBAVCODEC_BUILD       4675
19
#define LIBAVCODEC_BUILD_STR   "4675"
18
#define LIBAVCODEC_BUILD       4676
19
#define LIBAVCODEC_BUILD_STR   "4676"
20 20

  
21 21
#define LIBAVCODEC_IDENT	"FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR
22 22

  
23 23
enum CodecID {
24 24
    CODEC_ID_NONE, 
25 25
    CODEC_ID_MPEG1VIDEO,
26
    CODEC_ID_MPEG2VIDEO,
26 27
    CODEC_ID_MPEG2VIDEO_XVMC,
27 28
    CODEC_ID_H263,
28 29
    CODEC_ID_RV10,
......
219 220
#define CODEC_CAP_PARSE_ONLY      0x0004
220 221
#define CODEC_CAP_TRUNCATED       0x0008
221 222

  
223

  
222 224
#define FF_COMMON_FRAME \
223 225
    /**\
224 226
     * pointer to the picture planes.\
......
462 464
     *                    do something for a generic case as well.
463 465
     * - decoding: set by lavc.
464 466
     */
465
    enum PixelFormat pix_fmt;
467
    enum PixelFormat pix_fmt; //FIXME move to AVFrme
466 468
 
467 469
    /**
468 470
     * Frame rate emulation. If not zero lower layer (i.e. format handler) 
......
710 712
                       data is returned. Only MPEG codecs support this now. */
711 713
    
712 714
    /**
713
     * 0-> h263 quant 1-> mpeg quant.
715
     * 0-> default, 1-> mpeg quant.
714 716
     * - encoding: set by user.
715 717
     * - decoding: unused
716 718
     */
......
1281 1283
extern AVCodec mp3lame_encoder;
1282 1284
extern AVCodec oggvorbis_encoder;
1283 1285
extern AVCodec mpeg1video_encoder;
1286
extern AVCodec mpeg2video_encoder;
1284 1287
extern AVCodec h263_encoder;
1285 1288
extern AVCodec h263p_encoder;
1286 1289
extern AVCodec flv_encoder;
......
1587 1590
int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout);
1588 1591

  
1589 1592
/* memory */
1590
void *av_malloc(unsigned int size);
1593
void *av_malloc(unsigned int size); //FIXME unsigned could be bad, dunno, need thinking
1591 1594
void *av_mallocz(unsigned int size);
1592 1595
void *av_realloc(void *ptr, unsigned int size);
1593 1596
void av_free(void *ptr);

Also available in: Unified diff