[FFmpeg-cvslog] ffmpeg: move a local variable definition later.

Nicolas George git at videolan.org
Tue May 7 23:52:55 CEST 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon May  6 23:51:27 2013 +0200| [449704b47500bbd3530c584e50a5d76f02d90113] | committer: Nicolas George

ffmpeg: move a local variable definition later.

Fix a segfault when using the -map option without input files.

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

 ffmpeg_opt.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;



More information about the ffmpeg-cvslog mailing list