#include "libavutil/cpu.h"
#include "avcodec.h"
-
+#if FF_API_OLD_SAMPLE_FMT
/**
- * Generate string corresponding to the sample format with
- * number sample_fmt, or a header if sample_fmt is negative.
- *
- * @param[in] buf the buffer where to write the string
- * @param[in] buf_size the size of buf
- * @param[in] sample_fmt the number of the sample format to print the corresponding info string, or
- * a negative value to print the corresponding header.
- * Meaningful values for obtaining a sample format info vary from 0 to SAMPLE_FMT_NB -1.
+ * @deprecated Use av_get_sample_fmt_string() instead.
*/
+attribute_deprecated
void avcodec_sample_fmt_string(char *buf, int buf_size, int sample_fmt);
/**
- * @return NULL on error
+ * @deprecated Use av_get_sample_fmt_name() instead.
*/
+attribute_deprecated
const char *avcodec_get_sample_fmt_name(int sample_fmt);
/**
- * @return SAMPLE_FMT_NONE on error
+ * @deprecated Use av_get_sample_fmt() instead.
*/
-enum SampleFormat avcodec_get_sample_fmt(const char* name);
+attribute_deprecated
+enum AVSampleFormat avcodec_get_sample_fmt(const char* name);
+#endif
+#if FF_API_OLD_AUDIOCONVERT
/**
- * @return NULL on error
+ * @deprecated Use av_get_channel_layout() instead.
*/
-const char *avcodec_get_channel_name(int channel_id);
+attribute_deprecated
+int64_t avcodec_get_channel_layout(const char *name);
/**
- * @return channel layout that matches name, 0 if no match
+ * @deprecated Use av_get_channel_layout_string() instead.
*/
-int64_t avcodec_get_channel_layout(const char *name);
+attribute_deprecated
+void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
/**
- * Return description of channel layout
+ * @deprecated Use av_get_channel_layout_nb_channels() instead.
*/
-void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
+attribute_deprecated
+int avcodec_channel_layout_num_channels(int64_t channel_layout);
+#endif
/**
* Guess the channel layout
*/
int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
-/**
- * @return the number of channels in the channel layout.
- */
-int avcodec_channel_layout_num_channels(int64_t channel_layout);
-
struct AVAudioConvert;
typedef struct AVAudioConvert AVAudioConvert;
* @param flags See AV_CPU_FLAG_xx
* @return NULL on error
*/
-AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels,
- enum SampleFormat in_fmt, int in_channels,
+AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
+ enum AVSampleFormat in_fmt, int in_channels,
const float *matrix, int flags);
/**