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 /ffplay.c | |
| parent | caa7ad5dc68a9b287a49f1d34f557274d3feee9c (diff) | |
| download | ffmpeg-ba7d6e798eb11b463852479a5e09a68926e82af6.tar.gz | |
Remove usage of deprecated libavcodec/audioconvert.h functions.
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -30,6 +30,7 @@ #include "libavutil/pixdesc.h" #include "libavcore/imgutils.h" #include "libavcore/parseutils.h" +#include "libavcore/samplefmt.h" #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" @@ -2099,8 +2100,8 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) dec->sample_fmt, 1, NULL, 0); if (!is->reformat_ctx) { fprintf(stderr, "Cannot convert %s sample format to %s sample format\n", - avcodec_get_sample_fmt_name(dec->sample_fmt), - avcodec_get_sample_fmt_name(SAMPLE_FMT_S16)); + av_get_sample_fmt_name(dec->sample_fmt), + av_get_sample_fmt_name(SAMPLE_FMT_S16)); break; } is->audio_src_fmt= dec->sample_fmt; @@ -2109,7 +2110,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) if (is->reformat_ctx) { const void *ibuf[6]= {is->audio_buf1}; void *obuf[6]= {is->audio_buf2}; - int istride[6]= {av_get_bits_per_sample_format(dec->sample_fmt)/8}; + int istride[6]= {av_get_bits_per_sample_fmt(dec->sample_fmt)/8}; int ostride[6]= {2}; int len= data_size/istride[0]; if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) { |