[FFmpeg-devel] [PATCH] ffmpeg: move a local variable definition later.
Nicolas George
nicolas.george at normalesup.org
Tue May 7 00:14:59 CEST 2013
Fix a segfault when using the -map option without input files.
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
ffmpeg_opt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index ff80c8a..c87bf01 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;
--
1.7.10.4
More information about the ffmpeg-devel
mailing list