summaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-16 11:19:36 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-16 11:19:36 +0200
commitc2972a2800242229ac22e882fe60245a44ac026c (patch)
tree338b26ebfb55b128bfe6ba7a051ba482bae8d45c /libavresample
parent1eb2c0de9eeec9ff948a3460fb78027882f07d52 (diff)
parentc7247eb7fe2b95803983e8f7c4f0e904f050ca7b (diff)
downloadffmpeg-streaming-c2972a2800242229ac22e882fe60245a44ac026c.zip
ffmpeg-streaming-c2972a2800242229ac22e882fe60245a44ac026c.tar.gz
Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'
* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b': lavr: Remove unreachable code Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/resample.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c
index 3e9b0db..8f920fa 100644
--- a/libavresample/resample.c
+++ b/libavresample/resample.c
@@ -235,7 +235,6 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
{
ResampleContext *c;
AudioData *fifo_buf = NULL;
- int ret = 0;
if (compensation_distance < 0)
return AVERROR(EINVAL);
@@ -254,10 +253,8 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
} else {
c->dst_incr = c->ideal_dst_incr;
}
- return 0;
- ff_audio_data_free(&fifo_buf);
- return ret;
+ return 0;
}
static int resample(ResampleContext *c, void *dst, const void *src,
OpenPOWER on IntegriCloud