| author | Nicolas George <nicolas.george@normalesup.org> | 2013-05-06 21:51:27 (GMT) |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-05-07 16:39:45 (GMT) |
| commit | 449704b47500bbd3530c584e50a5d76f02d90113 (patch) | |
| tree | 113bed98e0d19bf49c649cf86473df8dced423d1 | |
| parent | d23b8462b5a4a9da78ed45c4a7a3b35d538df909 (diff) | |
| download | ffmpeg-449704b47500bbd3530c584e50a5d76f02d90113.zip ffmpeg-449704b47500bbd3530c584e50a5d76f02d90113.tar.gz ffmpeg-449704b47500bbd3530c584e50a5d76f02d90113.tar.bz2 | |
ffmpeg: move a local variable definition later.
Fix a segfault when using the -map option without input files.
| -rw-r--r-- | ffmpeg_opt.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |