Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'

* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/151/head
Hendrik Leppkes 9 years ago
commit c2972a2800
  1. 5
      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,

Loading…
Cancel
Save