From 449704b47500bbd3530c584e50a5d76f02d90113 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Mon, 6 May 2013 23:51:27 +0200
Subject: [PATCH] ffmpeg: move a local variable definition later.
Fix a segfault when using the -map option without input files.
---
ffmpeg_opt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index ff80c8ab443..c87bf011006 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1719,7 +1719,6 @@ static int open_output_file(OptionsContext *o, const char *filename)
} else {
for (i = 0; i < o->nb_stream_maps; i++) {
StreamMap *map = &o->stream_maps[i];
- int src_idx = input_files[map->file_index]->ist_index + map->stream_index;
if (map->disabled)
continue;
@@ -1747,6 +1746,8 @@ loop_end:
}
init_output_filter(ofilter, o, oc);
} else {
+ int src_idx = input_files[map->file_index]->ist_index + map->stream_index;
+
ist = input_streams[input_files[map->file_index]->ist_index + map->stream_index];
if(o->subtitle_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
continue;
--
GitLab