mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
loosen dependencies over allformats.h
Originally committed as revision 10513 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
84a72b1675
commit
6369638bf0
@ -20,7 +20,6 @@
|
||||
*/
|
||||
|
||||
#include "avformat.h"
|
||||
#include "allformats.h"
|
||||
#include "bitstream.h"
|
||||
#include "fifo.h"
|
||||
#include "mpeg.h"
|
||||
@ -77,6 +76,11 @@ typedef struct {
|
||||
|
||||
} 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)
|
||||
{
|
||||
|
@ -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 @@ struct PESContext {
|
||||
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.
|
||||
|
@ -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. */
|
||||
|
@ -21,7 +21,6 @@
|
||||
|
||||
|
||||
#include "avformat.h"
|
||||
#include "allformats.h"
|
||||
|
||||
typedef struct ThpDemuxContext {
|
||||
int version;
|
||||
|
@ -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 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
|
||||
|
||||
/* 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);
|
||||
|
@ -20,7 +20,6 @@
|
||||
*/
|
||||
|
||||
#include "avformat.h"
|
||||
#include "allformats.h"
|
||||
#include "bswap.h"
|
||||
|
||||
// specs say that maximum block size is 1Mb
|
||||
|
Loading…
Reference in New Issue
Block a user