From: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed, 16 Mar 2016 18:40:32 +0000 (+0100)
Subject: avcodec/resample: Remove disabled and faulty code
X-Git-Tag: android-x86-7.1-r1~5924
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50ef7361cb5f78c94da2323f3bae86c6bbd618c8;p=android-x86%2Fexternal-ffmpeg.git

avcodec/resample: Remove disabled and faulty code

Fixes Ticket5345

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

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 };