Revision 262d1c5d libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
27 27
 */
28 28

  
29 29
#include <errno.h>
30
#include "libavcore/samplefmt.h"
30 31
#include "libavutil/avutil.h"
31 32
#include "libavutil/cpu.h"
32 33

  
33 34
#define LIBAVCODEC_VERSION_MAJOR 52
34 35
#define LIBAVCODEC_VERSION_MINOR 94
35
#define LIBAVCODEC_VERSION_MICRO  0
36
#define LIBAVCODEC_VERSION_MICRO  1
36 37

  
37 38
#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
38 39
                                               LIBAVCODEC_VERSION_MINOR, \
......
75 76
#ifndef FF_API_INOFFICIAL
76 77
#define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
77 78
#endif
79
#ifndef FF_API_OLD_SAMPLE_FMT
80
#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 53)
81
#endif
78 82

  
79 83
#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
80 84
#define AV_TIME_BASE            1000000
......
410 414
#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
411 415
#endif
412 416

  
413
/**
414
 * all in native-endian format
415
 */
416
enum SampleFormat {
417
    SAMPLE_FMT_NONE = -1,
418
    SAMPLE_FMT_U8,              ///< unsigned 8 bits
419
    SAMPLE_FMT_S16,             ///< signed 16 bits
420
    SAMPLE_FMT_S32,             ///< signed 32 bits
421
    SAMPLE_FMT_FLT,             ///< float
422
    SAMPLE_FMT_DBL,             ///< double
423
    SAMPLE_FMT_NB               ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
424
};
417
#if FF_API_OLD_SAMPLE_FMT
418
#define SampleFormat AVSampleFormat
419

  
420
#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
421
#define SAMPLE_FMT_U8   AV_SAMPLE_FMT_U8
422
#define SAMPLE_FMT_S16  AV_SAMPLE_FMT_S16
423
#define SAMPLE_FMT_S32  AV_SAMPLE_FMT_S32
424
#define SAMPLE_FMT_FLT  AV_SAMPLE_FMT_FLT
425
#define SAMPLE_FMT_DBL  AV_SAMPLE_FMT_DBL
426
#define SAMPLE_FMT_NB   AV_SAMPLE_FMT_NB
427
#endif
425 428

  
426 429
/* Audio channel masks */
427 430
#define CH_FRONT_LEFT             0x00000001

Also available in: Unified diff