diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 23:28:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 23:52:39 +0200 |
| commit | bc0cbaca62b6d74e88a637eedc0cbed80721a0c7 (patch) | |
| tree | fdbeba21c3643aeaa8d5ffac27c4a79335f00aaf /ffmpeg_opt.c | |
| parent | a527e692592b7eef69430cc866bb96231526316c (diff) | |
| parent | 4582e4c086bc36e20e3c0b85c8108cfa352e0d88 (diff) | |
| download | ffmpeg-bc0cbaca62b6d74e88a637eedc0cbed80721a0c7.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi: add comments to explain the negotiation loop.
lavfi: fix filter format negotiation loop.
ffmpeg: move a local variable definition later.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -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 ff80c8ab44..c87bf01100 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; |