[FFmpeg-soc] [soc]: r4896 - concat/ffmpeg.c.diff

[gkovacs]

Author: gkovacs
Date: Sun Aug  2 03:00:42 2009
New Revision: 4896

Log:
no need to manually set nb_input_files or nb_input_streams

Modified:
   concat/ffmpeg.c.diff

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Sun Aug  2 02:51:27 2009	(r4895)
+++ concat/ffmpeg.c.diff	Sun Aug  2 03:00:42 2009	(r4896)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index e899180..9f8be3e 100644
+index e899180..8f4bc4c 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -70,6 +70,8 @@
@@ -83,7 +83,7 @@ index e899180..9f8be3e 100644
  
      if (!strcmp(filename, "-"))
          filename = "pipe:";
-@@ -2886,12 +2908,28 @@ static void opt_input_file(const char *filename)
+@@ -2886,12 +2908,25 @@ static void opt_input_file(const char *filename)
      ic->subtitle_codec_id= find_codec_or_die(subtitle_codec_name, CODEC_TYPE_SUBTITLE, 0);
      ic->flags |= AVFMT_FLAG_NONBLOCK;
  
@@ -98,13 +98,10 @@ index e899180..9f8be3e 100644
 +        av_log(ic, AV_LOG_DEBUG, "Generating playlist from %s\n", filename);
 +        concatenate_video_files = 1;
 +        av_strlcpy(ic->filename, filename, sizeof(ic->filename));
-+        ic->nb_streams = 2;
 +        ic->iformat = ff_concat_alloc_demuxer();
 +        ff_playlist_set_context(ic, playlist_ctx);
 +        ff_playlist_populate_context(playlist_ctx, playlist_ctx->pe_curidx);
 +        ff_playlist_set_streams(ic);
-+        nb_input_files = 1;
-+        input_files[0] = ic;
 +    } else {
 +        /* open the input file with generic libav function */
 +        err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
@@ -117,7 +114,7 @@ index e899180..9f8be3e 100644
      if(opt_programid) {
          int i;
          for(i=0; i<ic->nb_programs; i++)
-@@ -3000,6 +3038,8 @@ static void opt_input_file(const char *filename)
+@@ -3000,6 +3035,8 @@ static void opt_input_file(const char *filename)
          dump_format(ic, nb_input_files, filename, 0);
  
      nb_input_files++;