Implement functions:

av_get_sample_fmt_name()
av_get_sample_fmt()
av_get_sample_fmt_string()

in libavcore, and deprecate the corresponding libavcodec/audioconvert.h functions:
avcodec_get_sample_fmt_name()
avcodec_get_sample_fmt()
avcodec_sample_fmt_string()

Originally committed as revision 25653 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 8 insertions, 11 deletions

diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index 349065edc2..e7d262bae5 100644
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -32,28 +32,25 @@
 #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.
  */
+attribute_deprecated
 enum SampleFormat avcodec_get_sample_fmt(const char* name);
+#endif
 
 /**
  * @return NULL on error