[FFmpeg-cvslog] ffmpeg_opt: Fix sync_ist

Michael Niedermayer git at videolan.org
Fri Jun 26 13:37:31 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 26 12:37:28 2015 +0200| [29cc0a178e7556badea4451a920e51277b243bf0] | committer: Michael Niedermayer

ffmpeg_opt: Fix sync_ist

This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29cc0a178e7556badea4451a920e51277b243bf0
---

 ffmpeg_opt.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index a746405..f7f6553 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];
             }
         }
     }



More information about the ffmpeg-cvslog mailing list