RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

af_lavrresample: reconfigure libavresample only on successful init 

If filter initialization fails anyway, we don't need to reconfigure
libavresample.
This commit is contained in:
wm4 2013-11-09 23:21:17 +01:00
parent a89549e8db
commit 142d5c985e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/filter/af_lavrresample.c
View File

@ -250,14 +250,13 @@ static int control(struct af_instance *af, int cmd, void *arg)
af->mul = (double) (out->rate * out->nch) / (in->rate * in->nch);
af->delay = out->nch * s->opts.filter_size / FFMIN(af->mul, 1);
if (needs_lavrctx_reconfigure(s, in, out)) {
int r = configure_lavrr(af, in, out);
if (r != AF_OK)
return r;
}
return ((in->format == orig_in.format) &&
int r = ((in->format == orig_in.format) &&
mp_chmap_equals(&in->channels, &orig_in.channels))
? AF_OK : AF_FALSE;
? AF_OK : AF_FALSE;
if (r == AF_OK && needs_lavrctx_reconfigure(s, in, out))
r = configure_lavrr(af, in, out);
return r;
}
case AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET: {
if (af_to_avformat(*(int*)arg) == AV_SAMPLE_FMT_NONE)