diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-06-01 15:19:45 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-07-08 15:22:11 -0400 |
| commit | 8ca08066fc813c48722e9c5a79fcd58e725cc80f (patch) | |
| tree | 17254bcf69cf623af1881ed6e532e91a25c316ed /libavfilter | |
| parent | db0e7bd0bd1344b0edfd6a779e832fcd47cacd00 (diff) | |
| download | ffmpeg-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 'libavfilter')
| -rw-r--r-- | libavfilter/af_resample.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index 8a02cfe976..b62a374fd6 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -102,12 +102,6 @@ static int config_output(AVFilterLink *outlink) av_opt_set_int(s->avr, "in_sample_rate", inlink ->sample_rate, 0); av_opt_set_int(s->avr, "out_sample_rate", outlink->sample_rate, 0); - /* if both the input and output formats are s16 or u8, use s16 as - the internal sample format */ - if (av_get_bytes_per_sample(inlink->format) <= 2 && - av_get_bytes_per_sample(outlink->format) <= 2) - av_opt_set_int(s->avr, "internal_sample_fmt", AV_SAMPLE_FMT_S16P, 0); - if ((ret = avresample_open(s->avr)) < 0) return ret; |