From cda6cea0ada2ae7a985c874f3d50052d1aa6570c Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 21 Jul 2013 16:17:18 +0200 Subject: [PATCH] libeplayer3/container_ffmpeg: av_samples_alloc: use actual number for channels Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ee3f84913aa01037c1cee1c6ebc935a3a1e06519 Author: martii Date: 2013-07-21 (Sun, 21 Jul 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 4031f9b..078262a 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -598,7 +598,7 @@ static void FFMPEGThread(Context_t *context) { uint8_t *output = NULL; int in_samples = decoded_frame->nb_samples; int out_samples = av_rescale_rnd(swr_get_delay(swr, c->sample_rate) + in_samples, out_sample_rate, c->sample_rate, AV_ROUND_UP); - e = av_samples_alloc(&output, NULL, 2, out_samples, AV_SAMPLE_FMT_S16, 1); + e = av_samples_alloc(&output, NULL, out_channels, out_samples, AV_SAMPLE_FMT_S16, 1); if (e < 0) { fprintf(stderr, "av_samples_alloc: %d\n", -e); continue;