# HG changeset patch
# User aurel
# Date 1189983644 0
# Node ID c226029c8df4dd05449e8693fd264763e9b607e7
# Parent  2d6bfd63d60605321b61136864967fdaf4f4c4e7
loosen dependencies over allformats.h

diff -r 2d6bfd63d606 -r c226029c8df4 mpegenc.c
--- a/mpegenc.c	Sun Sep 16 19:51:10 2007 +0000
+++ b/mpegenc.c	Sun Sep 16 23:00:44 2007 +0000
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
 #include "bitstream.h"
 #include "fifo.h"
 #include "mpeg.h"
@@ -77,6 +76,11 @@
 
 } MpegMuxContext;
 
+extern AVOutputFormat mpeg1vcd_muxer;
+extern AVOutputFormat mpeg2dvd_muxer;
+extern AVOutputFormat mpeg2svcd_muxer;
+extern AVOutputFormat mpeg2vob_muxer;
+
 static int put_pack_header(AVFormatContext *ctx,
                            uint8_t *buf, int64_t timestamp)
 {
diff -r 2d6bfd63d606 -r c226029c8df4 mpegts.c
--- a/mpegts.c	Sun Sep 16 19:51:10 2007 +0000
+++ b/mpegts.c	Sun Sep 16 23:00:44 2007 +0000
@@ -21,7 +21,6 @@
 #include "avformat.h"
 #include "crc.h"
 #include "mpegts.h"
-#include "allformats.h"
 
 //#define DEBUG_SI
 //#define DEBUG_SEEK
@@ -145,6 +144,8 @@
     uint8_t header[MAX_PES_HEADER_SIZE];
 };
 
+extern AVInputFormat mpegts_demuxer;
+
 /**
  *  Assembles PES packets out of TS packets, and then calls the "section_cb"
  *  function when they are complete.
diff -r 2d6bfd63d606 -r c226029c8df4 riff.c
--- a/riff.c	Sun Sep 16 19:51:10 2007 +0000
+++ b/riff.c	Sun Sep 16 23:00:44 2007 +0000
@@ -22,7 +22,6 @@
 #include "avformat.h"
 #include "avcodec.h"
 #include "riff.h"
-#include "allformats.h" // for asf_muxer
 
 /* Note: when encoding, the first matching tag is used, so order is
    important if multiple tags possible for a given codec. */
diff -r 2d6bfd63d606 -r c226029c8df4 thp.c
--- a/thp.c	Sun Sep 16 19:51:10 2007 +0000
+++ b/thp.c	Sun Sep 16 23:00:44 2007 +0000
@@ -21,7 +21,6 @@
 
 
 #include "avformat.h"
-#include "allformats.h"
 
 typedef struct ThpDemuxContext {
     int              version;
diff -r 2d6bfd63d606 -r c226029c8df4 utils.c
--- a/utils.c	Sun Sep 16 19:51:10 2007 +0000
+++ b/utils.c	Sun Sep 16 23:00:44 2007 +0000
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
 #include "opt.h"
 #include "avstring.h"
 #include "riff.h"
@@ -468,7 +467,7 @@
 
     /* XXX: suppress this hack for redirectors */
 #ifdef CONFIG_REDIR_DEMUXER
-    if (fmt == &redir_demuxer) {
+    if (!strcmp(fmt->name, "redir")) {
         int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
         err = redir_open(ic_ptr, pb);
         url_fclose(pb);
diff -r 2d6bfd63d606 -r c226029c8df4 wv.c
--- a/wv.c	Sun Sep 16 19:51:10 2007 +0000
+++ b/wv.c	Sun Sep 16 23:00:44 2007 +0000
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
 #include "bswap.h"
 
 // specs say that maximum block size is 1Mb