Revision 5d6e4c16 libavcodec/mpegaudio.h

View differences:

libavcodec/mpegaudio.h
72 72

  
73 73
#if CONFIG_FLOAT
74 74
typedef float OUT_INT;
75
#define OUT_FMT SAMPLE_FMT_FLT
75
#define OUT_FMT AV_SAMPLE_FMT_FLT
76 76
#elif CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT
77 77
typedef int32_t OUT_INT;
78 78
#define OUT_MAX INT32_MAX
79 79
#define OUT_MIN INT32_MIN
80 80
#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31)
81
#define OUT_FMT SAMPLE_FMT_S32
81
#define OUT_FMT AV_SAMPLE_FMT_S32
82 82
#else
83 83
typedef int16_t OUT_INT;
84 84
#define OUT_MAX INT16_MAX
85 85
#define OUT_MIN INT16_MIN
86 86
#define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
87
#define OUT_FMT SAMPLE_FMT_S16
87
#define OUT_FMT AV_SAMPLE_FMT_S16
88 88
#endif
89 89

  
90 90
#if CONFIG_FLOAT

Also available in: Unified diff