From 8ca08066fc813c48722e9c5a79fcd58e725cc80f Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 1 Jun 2012 15:19:45 -0400 Subject: lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format Also make this the default value. --- avplay.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'avplay.c') diff --git a/avplay.c b/avplay.c index 1961f5fb8c..a42a0b48b6 100644 --- a/avplay.c +++ b/avplay.c @@ -1948,8 +1948,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) av_opt_set_int(is->avr, "out_channel_layout", is->sdl_channel_layout, 0); av_opt_set_int(is->avr, "out_sample_fmt", is->sdl_sample_fmt, 0); av_opt_set_int(is->avr, "out_sample_rate", dec->sample_rate, 0); - if (av_get_bytes_per_sample(dec->sample_fmt) <= 2) - av_opt_set_int(is->avr, "internal_sample_fmt", AV_SAMPLE_FMT_S16P, 0); if ((ret = avresample_open(is->avr)) < 0) { fprintf(stderr, "error initializing libavresample\n"); -- cgit v1.2.3