diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-26 12:37:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-26 12:41:43 +0200 |
| commit | 29cc0a178e7556badea4451a920e51277b243bf0 (patch) | |
| tree | a8eb64f00d0a4d7512e31efa96198209428acfa3 /ffmpeg_opt.c | |
| parent | f5822ea3798a9e222a70bd1e14186a5e0dd31f5c (diff) | |
| download | ffmpeg-29cc0a178e7556badea4451a920e51277b243bf0.tar.gz | |
ffmpeg_opt: Fix sync_ist
This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index a74640560b..f7f65535d2 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2027,6 +2027,7 @@ loop_end: if(o-> data_disable && ist->st->codec->codec_type == AVMEDIA_TYPE_DATA) continue; + ost = NULL; switch (ist->st->codec->codec_type) { case AVMEDIA_TYPE_VIDEO: ost = new_video_stream (o, oc, src_idx); break; case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream (o, oc, src_idx); break; @@ -2050,6 +2051,9 @@ loop_end: exit_program(1); } } + if (ost) + ost->sync_ist = input_streams[ input_files[map->sync_file_index]->ist_index + + map->sync_stream_index]; } } } |