[FFmpeg-cvslog] avcodec/resample: Remove disabled and faulty code

Michael Niedermayer git at videolan.org
Sat Apr 30 03:36:42 CEST 2016


ffmpeg | branch: release/2.6 | Michael Niedermayer <michael at niedermayer.cc> | Wed Mar 16 19:40:32 2016 +0100| [e1fb0a1dbc00676bbf76036386a6526d753073d0] | committer: Michael Niedermayer

avcodec/resample: Remove disabled and faulty code

Fixes Ticket5345

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 50ef7361cb5f78c94da2323f3bae86c6bbd618c8)

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1fb0a1dbc00676bbf76036386a6526d753073d0
---

 libavcodec/resample.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index c45aa16..ec311c7 100644
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -290,12 +290,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 };



More information about the ffmpeg-cvslog mailing list