From 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 12 Nov 2010 11:04:40 +0000 Subject: Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffplay.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ffplay.c') diff --git a/ffplay.c b/ffplay.c index c2c41343fc..d478bcb2a4 100644 --- a/ffplay.c +++ b/ffplay.c @@ -163,7 +163,7 @@ typedef struct VideoState { int audio_buf_index; /* in bytes */ AVPacket audio_pkt_temp; AVPacket audio_pkt; - enum SampleFormat audio_src_fmt; + enum AVSampleFormat audio_src_fmt; AVAudioConvert *reformat_ctx; int show_audio; /* if true, display audio samples */ @@ -2095,12 +2095,12 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) if (dec->sample_fmt != is->audio_src_fmt) { if (is->reformat_ctx) av_audio_convert_free(is->reformat_ctx); - is->reformat_ctx= av_audio_convert_alloc(SAMPLE_FMT_S16, 1, + is->reformat_ctx= av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1, dec->sample_fmt, 1, NULL, 0); if (!is->reformat_ctx) { fprintf(stderr, "Cannot convert %s sample format to %s sample format\n", av_get_sample_fmt_name(dec->sample_fmt), - av_get_sample_fmt_name(SAMPLE_FMT_S16)); + av_get_sample_fmt_name(AV_SAMPLE_FMT_S16)); break; } is->audio_src_fmt= dec->sample_fmt; @@ -2268,7 +2268,7 @@ static int stream_component_open(VideoState *is, int stream_index) return -1; } is->audio_hw_buf_size = spec.size; - is->audio_src_fmt= SAMPLE_FMT_S16; + is->audio_src_fmt= AV_SAMPLE_FMT_S16; } ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; -- cgit v1.2.3