From ee4d43ef7a89626de8eaf02bec5a7ca44d96edbf Mon Sep 17 00:00:00 2001
From: Oana Stratulat <oanaandreeastratulat@gmail.com>
Date: Fri, 6 Jan 2012 02:02:50 +0100
Subject: [PATCH] ffmpeg: check if number of input and output channels are
valid.
Fix Ticket887.
---
ffmpeg.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index e23ea6505ce..5bef906c367 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1096,8 +1096,14 @@ need_realloc:
av_opt_set_int(ost->swr, "icl", av_get_default_channel_layout(ost->audio_channels_mapped), 0);
av_opt_set_int(ost->swr, "uch", ost->audio_channels_mapped, 0);
}
- av_opt_set_int(ost->swr, "ich", dec->channels, 0);
- av_opt_set_int(ost->swr, "och", enc->channels, 0);
+ if (av_opt_set_int(ost->swr, "ich", dec->channels, 0) < 0) {
+ av_log(NULL, AV_LOG_FATAL, "Unsupported number of input channels\n");
+ exit_program(1);
+ }
+ if (av_opt_set_int(ost->swr, "och", enc->channels, 0) < 0) {
+ av_log(NULL, AV_LOG_FATAL, "Unsupported number of output channels\n");
+ exit_program(1);
+ }
if(audio_sync_method>1) av_opt_set_int(ost->swr, "flags", SWR_FLAG_RESAMPLE, 0);
if(ost->swr && swr_init(ost->swr) < 0){
av_log(NULL, AV_LOG_FATAL, "swr_init() failed\n");
--
GitLab