diff options
Diffstat (limited to 'audio/filter/af_lavrresample.c')
| -rw-r--r-- | audio/filter/af_lavrresample.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index d43f9ea814..8dce52cf67 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -338,7 +338,7 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags) if (needs_reorder(s->reorder_out, out->nch)) { if (af_fmt_is_planar(out->format)) { reorder_planes(data, s->reorder_out); - } else { + } else if (out->samples) { int out_size = out->samples * out->sstride; if (talloc_get_size(s->reorder_buffer) < out_size) s->reorder_buffer = talloc_realloc_size(s, s->reorder_buffer, out_size); @@ -346,7 +346,8 @@ static int filter(struct af_instance *af, struct mp_audio *data, int flags) int out_samples = avresample_convert(s->avrctx_out, (uint8_t **) data->planes, out_size, out->samples, (uint8_t **) out->planes, out_size, out->samples); - assert(out_samples == data->samples); + if (out_samples < 0) + MP_ERR(af, "Reordering failed.\n"); } } |