RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b' 

* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-16 11:19:36 +02:00
parent 1eb2c0de9e c7247eb7fe
commit c2972a2800
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavresample/resample.c
View File

@ -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,