RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: move a local variable definition later. 

Fix a segfault when using the -map option without input files.
This commit is contained in:
Nicolas George 2013-05-06 23:51:27 +02:00
parent d23b8462b5
commit 449704b475
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg_opt.c
View File

@ -1719,7 +1719,6 @@ static int open_output_file(OptionsContext *o, const char *filename)
} else { } else {
for (i = 0; i < o->nb_stream_maps; i++) { for (i = 0; i < o->nb_stream_maps; i++) {
StreamMap *map = &o->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) if (map->disabled)
continue; continue;
@ -1747,6 +1746,8 @@ loop_end:
} }
init_output_filter(ofilter, o, oc); init_output_filter(ofilter, o, oc);
} else { } 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]; 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) if(o->subtitle_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
continue; continue;