summaryrefslogtreecommitdiff
path: root/avplay.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-06-01 15:19:45 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-07-08 15:22:11 -0400
commit8ca08066fc813c48722e9c5a79fcd58e725cc80f (patch)
tree17254bcf69cf623af1881ed6e532e91a25c316ed /avplay.c
parentdb0e7bd0bd1344b0edfd6a779e832fcd47cacd00 (diff)
downloadffmpeg-8ca08066fc813c48722e9c5a79fcd58e725cc80f.tar.gz
lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
Also make this the default value.
Diffstat (limited to 'avplay.c')
-rw-r--r--avplay.c2
1 files changed, 0 insertions, 2 deletions
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");