Revision 72415b2a libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
30 30
#include "libavutil/avutil.h"
31 31

  
32 32
#define LIBAVCODEC_VERSION_MAJOR 52
33
#define LIBAVCODEC_VERSION_MINOR 63
33
#define LIBAVCODEC_VERSION_MINOR 64
34 34
#define LIBAVCODEC_VERSION_MICRO  0
35 35

  
36 36
#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
355 355
                                * stream (only used by libavformat) */
356 356
};
357 357

  
358
enum CodecType {
359
    CODEC_TYPE_UNKNOWN = -1,
360
    CODEC_TYPE_VIDEO,
361
    CODEC_TYPE_AUDIO,
362
    CODEC_TYPE_DATA,
363
    CODEC_TYPE_SUBTITLE,
364
    CODEC_TYPE_ATTACHMENT,
365
    CODEC_TYPE_NB
358
enum AVMediaType {
359
    AVMEDIA_TYPE_UNKNOWN = -1,
360
    AVMEDIA_TYPE_VIDEO,
361
    AVMEDIA_TYPE_AUDIO,
362
    AVMEDIA_TYPE_DATA,
363
    AVMEDIA_TYPE_SUBTITLE,
364
    AVMEDIA_TYPE_ATTACHMENT,
365
    AVMEDIA_TYPE_NB
366 366
};
367 367

  
368
#if LIBAVCODEC_VERSION_MAJOR < 53
369
#define CodecType AVMediaType
370

  
371
#define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN
372
#define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
373
#define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
374
#define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA
375
#define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE
376
#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
377
#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
378
#endif
379

  
368 380
/**
369 381
 * all in native-endian format
370 382
 */
......
1277 1289
    void *opaque;
1278 1290

  
1279 1291
    char codec_name[32];
1280
    enum CodecType codec_type; /* see CODEC_TYPE_xxx */
1292
    enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
1281 1293
    enum CodecID codec_id; /* see CODEC_ID_xxx */
1282 1294

  
1283 1295
    /**
......
2657 2669
     * This is the primary way to find a codec from the user perspective.
2658 2670
     */
2659 2671
    const char *name;
2660
    enum CodecType type;
2672
    enum AVMediaType type;
2661 2673
    enum CodecID id;
2662 2674
    int priv_data_size;
2663 2675
    int (*init)(AVCodecContext *);
......
2701 2713
    /**
2702 2714
     * Type of codec implemented by the hardware accelerator.
2703 2715
     *
2704
     * See CODEC_TYPE_xxx
2716
     * See AVMEDIA_TYPE_xxx
2705 2717
     */
2706
    enum CodecType type;
2718
    enum AVMediaType type;
2707 2719

  
2708 2720
    /**
2709 2721
     * Codec implemented by the hardware accelerator.
......
3241 3253

  
3242 3254
/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
3243 3255
 *  we WILL change its arguments and name a few times! */
3244
void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType);
3256
void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
3245 3257

  
3246 3258
/**
3247 3259
 * Allocates an AVCodecContext and sets its fields to default values.  The
......
3254 3266

  
3255 3267
/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
3256 3268
 *  we WILL change its arguments and name a few times! */
3257
AVCodecContext *avcodec_alloc_context2(enum CodecType);
3269
AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
3258 3270

  
3259 3271
/**
3260 3272
 * Sets the fields of the given AVFrame to default values.

Also available in: Unified diff