Revision a377cfa6

View differences:

libavcodec/avcodec.h
57 57
#ifndef FF_API_OPT_SHOW
58 58
#define FF_API_OPT_SHOW         (LIBAVCODEC_VERSION_MAJOR < 53)
59 59
#endif
60
#ifndef FF_API_AUDIO_OLD
61
#define FF_API_AUDIO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
62
#endif
60 63

  
61 64
#define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
62 65
#define AV_TIME_BASE            1000000
......
2998 3001

  
2999 3002
typedef struct ReSampleContext ReSampleContext;
3000 3003

  
3001
#if LIBAVCODEC_VERSION_MAJOR < 53
3004
#if FF_API_AUDIO_OLD
3002 3005
/**
3003 3006
 * @deprecated Use av_audio_resample_init() instead.
3004 3007
 */
......
3459 3462
 */
3460 3463
int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
3461 3464

  
3462
#if LIBAVCODEC_VERSION_MAJOR < 53
3465
#if FF_API_AUDIO_OLD
3463 3466
/**
3464 3467
 * Decode an audio frame from buf into samples.
3465 3468
 * Wrapper function which calls avcodec_decode_audio3.
libavcodec/resample.c
217 217
    return s;
218 218
}
219 219

  
220
#if LIBAVCODEC_VERSION_MAJOR < 53
220
#if FF_API_AUDIO_OLD
221 221
ReSampleContext *audio_resample_init(int output_channels, int input_channels,
222 222
                                     int output_rate, int input_rate)
223 223
{
libavcodec/utils.c
630 630
    return ret;
631 631
}
632 632

  
633
#if LIBAVCODEC_VERSION_MAJOR < 53
633
#if FF_API_AUDIO_OLD
634 634
int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
635 635
                         int *frame_size_ptr,
636 636
                         const uint8_t *buf, int buf_size)

Also available in: Unified diff