summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-03 20:19:34 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-11-03 20:19:34 +0000
commitba7d6e798eb11b463852479a5e09a68926e82af6 (patch)
tree20e8a1da86432da35c75c0578b4f297ea48aa6b5 /libavcodec/utils.c
parentcaa7ad5dc68a9b287a49f1d34f557274d3feee9c (diff)
Remove usage of deprecated libavcodec/audioconvert.h functions.
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8169b374b5..4d13e0aa6e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -30,6 +30,7 @@
#include "libavutil/crc.h"
#include "libavutil/pixdesc.h"
#include "libavcore/imgutils.h"
+#include "libavcore/samplefmt.h"
#include "avcodec.h"
#include "dsputil.h"
#include "libavutil/opt.h"
@@ -923,7 +924,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
avcodec_get_channel_layout_string(buf + strlen(buf), buf_size - strlen(buf), enc->channels, enc->channel_layout);
if (enc->sample_fmt != SAMPLE_FMT_NONE) {
snprintf(buf + strlen(buf), buf_size - strlen(buf),
- ", %s", avcodec_get_sample_fmt_name(enc->sample_fmt));
+ ", %s", av_get_sample_fmt_name(enc->sample_fmt));
}
break;
case AVMEDIA_TYPE_DATA: