Mercurial > libavformat.hg
changeset 2555:c226029c8df4 libavformat
loosen dependencies over allformats.h
| author | aurel |
|---|---|
| date | Sun, 16 Sep 2007 23:00:44 +0000 |
| parents | 2d6bfd63d606 |
| children | cb131102b256 |
| files | mpegenc.c mpegts.c riff.c thp.c utils.c wv.c |
| diffstat | 6 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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.
--- 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. */
--- 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;
--- 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);