diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-03 20:19:34 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-03 20:19:34 +0000 |
| commit | ba7d6e798eb11b463852479a5e09a68926e82af6 (patch) | |
| tree | 20e8a1da86432da35c75c0578b4f297ea48aa6b5 /libavcodec/resample.c | |
| parent | caa7ad5dc68a9b287a49f1d34f557274d3feee9c (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/resample.c')
| -rw-r--r-- | libavcodec/resample.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/resample.c b/libavcodec/resample.c index 222b28ce83..89e2d71e53 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -27,6 +27,7 @@ #include "avcodec.h" #include "audioconvert.h" #include "libavutil/opt.h" +#include "libavcore/samplefmt.h" struct AVResampleContext; @@ -174,15 +175,15 @@ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels, s->sample_fmt [0] = sample_fmt_in; s->sample_fmt [1] = sample_fmt_out; - s->sample_size[0] = av_get_bits_per_sample_format(s->sample_fmt[0])>>3; - s->sample_size[1] = av_get_bits_per_sample_format(s->sample_fmt[1])>>3; + s->sample_size[0] = av_get_bits_per_sample_fmt(s->sample_fmt[0])>>3; + s->sample_size[1] = av_get_bits_per_sample_fmt(s->sample_fmt[1])>>3; if (s->sample_fmt[0] != SAMPLE_FMT_S16) { if (!(s->convert_ctx[0] = av_audio_convert_alloc(SAMPLE_FMT_S16, 1, s->sample_fmt[0], 1, NULL, 0))) { av_log(s, AV_LOG_ERROR, "Cannot convert %s sample format to s16 sample format\n", - avcodec_get_sample_fmt_name(s->sample_fmt[0])); + av_get_sample_fmt_name(s->sample_fmt[0])); av_free(s); return NULL; } @@ -193,7 +194,7 @@ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels, SAMPLE_FMT_S16, 1, NULL, 0))) { av_log(s, AV_LOG_ERROR, "Cannot convert s16 sample format to %s sample format\n", - avcodec_get_sample_fmt_name(s->sample_fmt[1])); + av_get_sample_fmt_name(s->sample_fmt[1])); av_audio_convert_free(s->convert_ctx[0]); av_free(s); return NULL; |