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

[gkovacs]

Author: gkovacs
Date: Sun Aug  2 03:03:10 2009
New Revision: 4897

Log:
removed concatenate_video_files variable

Modified:
   concat/ffmpeg.c.diff

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Sun Aug  2 03:00:42 2009	(r4896)
+++ concat/ffmpeg.c.diff	Sun Aug  2 03:03:10 2009	(r4897)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index e899180..8f4bc4c 100644
+index e899180..c7cea6e 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -70,6 +70,8 @@
@@ -75,15 +75,7 @@ index e899180..8f4bc4c 100644
          }
      }
  
-@@ -2852,6 +2873,7 @@ static void opt_input_file(const char *filename)
-     AVFormatParameters params, *ap = &params;
-     int err, i, ret, rfps, rfps_base;
-     int64_t timestamp;
-+    char concatenate_video_files = 0;
- 
-     if (!strcmp(filename, "-"))
-         filename = "pipe:";
-@@ -2886,12 +2908,25 @@ static void opt_input_file(const char *filename)
+@@ -2886,12 +2907,24 @@ 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;
  
@@ -92,16 +84,15 @@ index e899180..8f4bc4c 100644
 -    if (err < 0) {
 -        print_error(filename, err);
 -        av_exit(1);
-+    err = 0;
 +    playlist_ctx = ff_playlist_from_encodedstring(filename, ',');
 +    if (playlist_ctx) {
 +        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->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);
++        err = 0;
 +    } else {
 +        /* open the input file with generic libav function */
 +        err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
@@ -114,12 +105,3 @@ index e899180..8f4bc4c 100644
      if(opt_programid) {
          int i;
          for(i=0; i<ic->nb_programs; i++)
-@@ -3000,6 +3035,8 @@ static void opt_input_file(const char *filename)
-         dump_format(ic, nb_input_files, filename, 0);
- 
-     nb_input_files++;
-+    if (concatenate_video_files)
-+        nb_input_files = 1;
-     file_iformat = NULL;
-     file_oformat = NULL;
-