summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2016-03-16 19:40:32 +0100
committerMichael Niedermayer <[email protected]>2016-03-16 19:52:01 +0100
commit50ef7361cb5f78c94da2323f3bae86c6bbd618c8 (patch)
tree8e832917e818cfeb5240fc1fee7c5cbcf1bc72e7
parent7d9e064cc13cb1b9db854c60bfff3ed3dc60ab7b (diff)
avcodec/resample: Remove disabled and faulty code
Fixes Ticket5345 Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/resample.c6
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 };