[FFmpeg-soc] [soc]: r4881 - in concat: ffmpeg.c.diff libavformat/concat.c

[gkovacs]

Author: gkovacs
Date: Sat Aug  1 04:02:16 2009
New Revision: 4881

Log:
don't implcitly declare ff_concat_alloc_demuxer

Modified:
   concat/ffmpeg.c.diff
   concat/libavformat/concat.c

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Sat Aug  1 03:56:47 2009	(r4880)
+++ concat/ffmpeg.c.diff	Sat Aug  1 04:02:16 2009	(r4881)
@@ -1,12 +1,12 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index 22bfed8..945c9c7 100644
+index 22bfed8..3b2a603 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -70,6 +70,8 @@
  
  #undef exit
  
-+#include "libavformat/playlist.h"
++#include "libavformat/concat.h"
 +
  const char program_name[] = "FFmpeg";
  const int program_birth_year = 2000;

Modified: concat/libavformat/concat.c
==============================================================================
--- concat/libavformat/concat.c	Sat Aug  1 03:56:47 2009	(r4880)
+++ concat/libavformat/concat.c	Sat Aug  1 04:02:16 2009	(r4881)
@@ -30,7 +30,7 @@
  *  the PlaylistContext in the AVFormatContext.
  */
 
-#include "concatgen.h"
+#include "concat.h"
 
 // The FFmpeg codecs we support, and the IDs they have in the file
 static const AVCodecTag codec_concat_tags[] = {