Revision 58f26ba9

View differences:

libav/avienc.c
58 58
    { CODEC_ID_H263, MKTAG('U', '2', '6', '3') },
59 59
    { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */
60 60
    { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
61
    { CODEC_ID_OPENDIVX, MKTAG('D', 'I', 'V', 'X') },
62
    { CODEC_ID_OPENDIVX, MKTAG('d', 'i', 'v', 'x') },
63
    { CODEC_ID_OPENDIVX, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
61
    { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
62
    { CODEC_ID_MPEG4, MKTAG('d', 'i', 'v', 'x') },
63
    { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
64 64
    { CODEC_ID_MSMPEG4, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
65 65
    { CODEC_ID_MSMPEG4, MKTAG('M', 'P', '4', '3') }, 
66 66
    { 0, 0 },
libavcodec/apiexample.c
292 292
    /* put default values */
293 293
    memset(c, 0, sizeof(*c));
294 294

  
295
    /* for some codecs, such as msmpeg4 and opendivx, width and height
295
    /* for some codecs, such as msmpeg4 and mpeg4, width and height
296 296
       MUST be initialized there because these info are not available
297 297
       in the bitstream */
298 298

  
......
320 320
           and this is the only method to use them because you cannot
321 321
           know the compressed data size before analysing it. 
322 322

  
323
           BUT some other codecs (msmpeg4, opendivx) are inherently
324
           frame based, so you must call them with all the data for
325
           one frame exactly. You must also initialize 'width' and
323
           BUT some other codecs (msmpeg4, mpeg4) are inherently frame
324
           based, so you must call them with all the data for one
325
           frame exactly. You must also initialize 'width' and
326 326
           'height' before initializing them. */
327 327

  
328 328
        /* NOTE2: some codecs allow the raw parameters (frame size,
libavcodec/mpegvideo.c
283 283
        s->out_format = FMT_H263;
284 284
        s->h263_rv10 = 1;
285 285
        break;
286
    case CODEC_ID_OPENDIVX:
286
    case CODEC_ID_MPEG4:
287 287
        s->out_format = FMT_H263;
288 288
        s->h263_pred = 1;
289 289
        s->unrestricted_mv = 1;
......
1341 1341
    MPV_encode_end,
1342 1342
};
1343 1343

  
1344
AVCodec opendivx_encoder = {
1345
    "opendivx",
1344
AVCodec mpeg4_encoder = {
1345
    "mpeg4",
1346 1346
    CODEC_TYPE_VIDEO,
1347
    CODEC_ID_OPENDIVX,
1347
    CODEC_ID_MPEG4,
1348 1348
    sizeof(MpegEncContext),
1349 1349
    MPV_encode_init,
1350 1350
    MPV_encode_picture,
libavcodec/mpegvideo.h
31 31
#define MPEG_BUF_SIZE (16 * 1024)
32 32

  
33 33
typedef struct MpegEncContext {
34
    struct AVCodecContext *avctx;
34 35
    /* the following parameters must be initialized before encoding */
35 36
    int width, height; /* picture size. must be a multiple of 16 */
36 37
    int gop_size;
......
40 41
    enum OutputFormat out_format; /* output format */
41 42
    int h263_plus; /* h263 plus headers */
42 43
    int h263_rv10; /* use RV10 variation for H263 */
43
    int h263_pred; /* use OpenDIVX (aka mpeg4) ac/dc predictions */
44
    int h263_pred; /* use mpeg4/h263 ac/dc predictions */
44 45
    int h263_msmpeg4; /* generate MSMPEG4 compatible stream */
45 46
    int h263_intel; /* use I263 intel h263 header */
46 47
    int fixed_qscale; /* fixed qscale if non zero */
libavcodec/utils.c
350 350
    register_avcodec(&h263p_encoder);
351 351
    register_avcodec(&rv10_encoder);
352 352
    register_avcodec(&mjpeg_encoder);
353
    register_avcodec(&opendivx_encoder);
353
    register_avcodec(&mpeg4_encoder);
354 354
    register_avcodec(&msmpeg4_encoder);
355 355
#endif /* CONFIG_ENCODERS */
356 356
    register_avcodec(&pcm_codec);
......
359 359
    /* decoders */
360 360
#ifdef CONFIG_DECODERS
361 361
    register_avcodec(&h263_decoder);
362
    register_avcodec(&opendivx_decoder);
362
    register_avcodec(&mpeg4_decoder);
363 363
    register_avcodec(&msmpeg4_decoder);
364 364
    register_avcodec(&mpeg_decoder);
365 365
    register_avcodec(&h263i_decoder);

Also available in: Unified diff