diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-16 19:40:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-27 04:40:11 +0200 |
| commit | e8b1ce8d1b52025888e28f9715c055685ec939b1 (patch) | |
| tree | e20e43c724608a38fff3f76ca82ac689abd83421 | |
| parent | d77e1c712bf1ea5cf9873b1e79bdb57c257ea9bc (diff) | |
| download | ffmpeg-e8b1ce8d1b52025888e28f9715c055685ec939b1.tar.gz | |
avcodec/resample: Remove disabled and faulty code
Fixes Ticket5345
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 50ef7361cb5f78c94da2323f3bae86c6bbd618c8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/resample.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/resample.c b/libavcodec/resample.c index 0f5ee84942..4c5eb9f10e 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -291,12 +291,6 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl short *output_bak = NULL; int lenout; - if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) { - /* nothing to do */ - memcpy(output, input, nb_samples * s->input_channels * sizeof(short)); - return nb_samples; - } - if (s->sample_fmt[0] != AV_SAMPLE_FMT_S16) { int istride[1] = { s->sample_size[0] }; int ostride[1] = { 2 }; |