[Ffmpeg-cvslog] CVS: ffmpeg/libavformat allformats.c, 1.49, 1.50 asf-enc.c, 1.72, 1.73 asf.c, 1.84, 1.85 au.c, 1.21, 1.22 avienc.c, 1.111, 1.112 avio.c, 1.14, 1.15 aviobuf.c, 1.30, 1.31 ffm.c, 1.44, 1.45 jpeg.c, 1.14, 1.15 mmf.c, 1.3, 1.4 mp3.c, 1.10, 1.11 mpeg.c, 1.88, 1.89 mpegts.c, 1.32, 1.33 mpjpeg.c, 1.6, 1.7 nut.c, 1.55, 1.56 ogg.c, 1.25, 1.26 ogg2.c, 1.9, 1.10 raw.c, 1.57, 1.58 rm.c, 1.48, 1.49 sgi.c, 1.4, 1.5 swf.c, 1.28, 1.29 wav.c, 1.54, 1.55 yuv4mpeg.c, 1.25, 1.26
Diego Biurrun CVS
diego
Fri Sep 23 02:25:45 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv19763/libavformat
Modified Files:
allformats.c asf-enc.c asf.c au.c avienc.c avio.c aviobuf.c
ffm.c jpeg.c mmf.c mp3.c mpeg.c mpegts.c mpjpeg.c nut.c ogg.c
ogg2.c raw.c rm.c sgi.c swf.c wav.c yuv4mpeg.c
Log Message:
Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.
Index: allformats.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- allformats.c 2 Sep 2005 19:18:59 -0000 1.49
+++ allformats.c 23 Sep 2005 00:25:41 -0000 1.50
@@ -37,36 +37,36 @@
mpegps_init();
mpegts_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
crc_init();
img_init();
img2_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
raw_init();
mp3_init();
rm_init();
asf_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
avienc_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
avidec_init();
ff_wav_init();
ff_mmf_init();
swf_init();
au_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
gif_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
mov_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
movenc_init();
jpeg_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
ff_dv_init();
fourxm_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
flvenc_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
flvdec_init();
str_init();
roq_init();
@@ -111,7 +111,7 @@
nsvdec_init();
daud_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* image formats */
#if 0
av_register_image_format(&pnm_image_format);
@@ -128,7 +128,7 @@
#endif
av_register_image_format(&gif_image_format);
// av_register_image_format(&sgi_image_format); heap corruption, dont enable
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* file protocols */
register_protocol(&file_protocol);
Index: asf-enc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf-enc.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- asf-enc.c 17 Jul 2005 22:24:35 -0000 1.72
+++ asf-enc.c 23 Sep 2005 00:25:41 -0000 1.73
@@ -23,7 +23,7 @@
#undef NDEBUG
#include <assert.h>
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
#define ASF_INDEXED_INTERVAL 10000000
@@ -858,4 +858,4 @@
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
Index: asf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- asf.c 10 Aug 2005 23:41:20 -0000 1.84
+++ asf.c 23 Sep 2005 00:25:41 -0000 1.85
@@ -792,17 +792,17 @@
asf_read_pts,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
extern AVOutputFormat asf_oformat;
extern AVOutputFormat asf_stream_oformat;
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int asf_init(void)
{
av_register_input_format(&asf_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&asf_oformat);
av_register_output_format(&asf_stream_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: au.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/au.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- au.c 17 Jul 2005 22:24:35 -0000 1.21
+++ au.c 23 Sep 2005 00:25:41 -0000 1.22
@@ -39,7 +39,7 @@
{ 0, 0 },
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* AUDIO_FILE header */
static int put_au_header(ByteIOContext *pb, AVCodecContext *enc)
{
@@ -97,7 +97,7 @@
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
static int au_probe(AVProbeData *p)
{
@@ -188,7 +188,7 @@
pcm_read_seek,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat au_oformat = {
"au",
"SUN AU Format",
@@ -201,13 +201,13 @@
au_write_packet,
au_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int au_init(void)
{
av_register_input_format(&au_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&au_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: avienc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- avienc.c 6 Sep 2005 15:02:43 -0000 1.111
+++ avienc.c 23 Sep 2005 00:25:41 -0000 1.112
@@ -24,7 +24,7 @@
* - fill all fields if non streamed (nb_frames for example)
*/
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
typedef struct AVIIentry {
unsigned int flags, pos, len;
} AVIIentry;
@@ -71,7 +71,7 @@
put_le32(pb, (uint32_t)(pos - start));
url_fseek(pb, pos, SEEK_SET);
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* Note: when encoding, the first matching tag is used, so order is
important if multiple tags possible for a given codec. */
@@ -245,7 +245,7 @@
return codec_get_id(codec_wav_tags, tag);
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* BITMAPINFOHEADER header */
void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf)
{
@@ -752,4 +752,4 @@
av_register_output_format(&avi_oformat);
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
Index: avio.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avio.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- avio.c 19 Jun 2004 03:59:34 -0000 1.14
+++ avio.c 23 Sep 2005 00:25:41 -0000 1.15
@@ -100,7 +100,7 @@
return ret;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
int url_write(URLContext *h, unsigned char *buf, int size)
{
int ret;
@@ -112,7 +112,7 @@
ret = h->prot->url_write(h, buf, size);
return ret;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
offset_t url_seek(URLContext *h, offset_t pos, int whence)
{
Index: aviobuf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/aviobuf.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- aviobuf.c 19 Jul 2005 14:50:22 -0000 1.30
+++ aviobuf.c 23 Sep 2005 00:25:41 -0000 1.31
@@ -54,7 +54,7 @@
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static void flush_buffer(ByteIOContext *s)
{
if (s->buf_ptr > s->buffer) {
@@ -104,7 +104,7 @@
flush_buffer(s);
s->must_flush = 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
{
@@ -113,7 +113,7 @@
if (whence != SEEK_CUR && whence != SEEK_SET)
return -EINVAL;
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
if (s->write_flag) {
if (whence == SEEK_CUR) {
offset1 = s->pos + (s->buf_ptr - s->buffer);
@@ -136,7 +136,7 @@
s->pos = offset;
}
} else
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
{
if (whence == SEEK_CUR) {
offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer);
@@ -193,7 +193,7 @@
return s->error;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
void put_le32(ByteIOContext *s, unsigned int val)
{
put_byte(s, val);
@@ -254,7 +254,7 @@
put_byte(s, *tag++);
}
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* Input stream */
@@ -463,7 +463,7 @@
/* link with avio functions */
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int url_write_packet(void *opaque, uint8_t *buf, int buf_size)
{
URLContext *h = opaque;
@@ -471,7 +471,7 @@
}
#else
#define url_write_packet NULL
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
static int url_read_packet(void *opaque, uint8_t *buf, int buf_size)
{
@@ -564,7 +564,7 @@
return s->opaque;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* XXX: currently size is limited */
int url_fprintf(ByteIOContext *s, const char *fmt, ...)
{
@@ -578,7 +578,7 @@
put_buffer(s, buf, strlen(buf));
return ret;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* note: unlike fgets, the EOL character is not returned and a whole
line is parsed. return NULL if first char read was EOF */
@@ -616,7 +616,7 @@
return s->max_packet_size;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* buffer handling */
int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags)
{
@@ -779,4 +779,4 @@
av_free(d);
return size;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
Index: ffm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ffm.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ffm.c 19 Jul 2005 14:50:22 -0000 1.44
+++ ffm.c 23 Sep 2005 00:25:41 -0000 1.45
@@ -56,7 +56,7 @@
/* disable pts hack for testing */
int ffm_nopts = 0;
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static void flush_packet(AVFormatContext *s)
{
FFMContext *ffm = s->priv_data;
@@ -294,7 +294,7 @@
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* ffm demux */
@@ -763,7 +763,7 @@
ffm_seek,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat ffm_oformat = {
"ffm",
"ffm format",
@@ -777,13 +777,13 @@
ffm_write_packet,
ffm_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int ffm_init(void)
{
av_register_input_format(&ffm_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&ffm_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: jpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/jpeg.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jpeg.c 26 Nov 2003 20:57:15 -0000 1.14
+++ jpeg.c 23 Sep 2005 00:25:41 -0000 1.15
@@ -160,7 +160,7 @@
return jctx.ret_code;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int jpeg_write(ByteIOContext *pb, AVImageInfo *info)
{
AVCodecContext *c;
@@ -222,7 +222,7 @@
av_free(c);
return ret;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVImageFormat jpeg_image_format = {
"jpeg",
@@ -230,9 +230,9 @@
jpeg_probe,
jpeg_read,
(1 << PIX_FMT_YUVJ420P) | (1 << PIX_FMT_YUVJ422P) | (1 << PIX_FMT_YUVJ444P),
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
jpeg_write,
#else
NULL,
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
};
Index: mmf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mmf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mmf.c 20 Sep 2005 23:52:29 -0000 1.3
+++ mmf.c 23 Sep 2005 00:25:41 -0000 1.4
@@ -24,7 +24,7 @@
offset_t data_size;
} MMFContext;
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
static int mmf_rate_code(int rate)
@@ -160,7 +160,7 @@
}
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
static int mmf_probe(AVProbeData *p)
{
@@ -308,7 +308,7 @@
mmf_read_seek,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat mmf_oformat = {
"mmf",
"mmf format",
@@ -321,14 +321,14 @@
mmf_write_packet,
mmf_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int ff_mmf_init(void)
{
av_register_input_format(&mmf_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&mmf_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: mp3.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mp3.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mp3.c 17 Jul 2005 22:24:35 -0000 1.10
+++ mp3.c 23 Sep 2005 00:25:41 -0000 1.11
@@ -314,7 +314,7 @@
return 0;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* simple formats */
static int mp3_write_header(struct AVFormatContext *s)
{
@@ -340,7 +340,7 @@
}
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat mp3_iformat = {
"mp3",
@@ -353,7 +353,7 @@
.extensions = "mp2,mp3,m2a", /* XXX: use probe */
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat mp2_oformat = {
"mp2",
"MPEG audio layer 2",
@@ -385,16 +385,16 @@
mp3_write_trailer,
};
#endif
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int mp3_init(void)
{
av_register_input_format(&mp3_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&mp2_oformat);
#ifdef CONFIG_MP3LAME
av_register_output_format(&mp3_oformat);
#endif
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: mpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpeg.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- mpeg.c 17 Jul 2005 22:24:35 -0000 1.88
+++ mpeg.c 23 Sep 2005 00:25:41 -0000 1.89
@@ -107,7 +107,7 @@
static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat mpeg1system_mux;
static AVOutputFormat mpeg1vcd_mux;
static AVOutputFormat mpeg2vob_mux;
@@ -1253,7 +1253,7 @@
}
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/*********************************************/
/* demux code */
@@ -1707,7 +1707,7 @@
return dts;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat mpeg1system_mux = {
"mpeg",
"MPEG1 System format",
@@ -1775,7 +1775,7 @@
mpeg_mux_end,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat mpegps_demux = {
"mpeg",
@@ -1792,13 +1792,13 @@
int mpegps_init(void)
{
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&mpeg1system_mux);
av_register_output_format(&mpeg1vcd_mux);
av_register_output_format(&mpeg2vob_mux);
av_register_output_format(&mpeg2svcd_mux);
av_register_output_format(&mpeg2dvd_mux);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
av_register_input_format(&mpegps_demux);
return 0;
}
Index: mpegts.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpegts.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- mpegts.c 6 Sep 2005 21:25:35 -0000 1.32
+++ mpegts.c 23 Sep 2005 00:25:41 -0000 1.33
@@ -1498,7 +1498,7 @@
int mpegts_init(void)
{
av_register_input_format(&mpegts_demux);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&mpegts_mux);
#endif
return 0;
Index: mpjpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpjpeg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mpjpeg.c 10 Jul 2005 10:28:59 -0000 1.6
+++ mpjpeg.c 23 Sep 2005 00:25:41 -0000 1.7
@@ -22,7 +22,7 @@
#define BOUNDARY_TAG "ffserver"
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int mpjpeg_write_header(AVFormatContext *s)
{
uint8_t buf1[256];
@@ -70,4 +70,4 @@
av_register_output_format(&mpjpeg_format);
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
Index: nut.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/nut.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- nut.c 11 Sep 2005 08:32:25 -0000 1.55
+++ nut.c 23 Sep 2005 00:25:41 -0000 1.56
@@ -394,7 +394,7 @@
}
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static void put_v(ByteIOContext *bc, uint64_t val)
{
@@ -843,7 +843,7 @@
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
static int nut_probe(AVProbeData *p)
{
@@ -1430,7 +1430,7 @@
.extensions = "nut",
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat nut_oformat = {
"nut",
"nut format",
@@ -1450,13 +1450,13 @@
nut_write_trailer,
.flags = AVFMT_GLOBALHEADER,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int nut_init(void)
{
av_register_input_format(&nut_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&nut_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: ogg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ogg.c 21 Sep 2005 23:09:16 -0000 1.25
+++ ogg.c 23 Sep 2005 00:25:41 -0000 1.26
@@ -29,7 +29,7 @@
} OggContext ;
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int ogg_write_header(AVFormatContext *avfcontext)
{
OggContext *context = avfcontext->priv_data;
@@ -149,7 +149,7 @@
ogg_write_packet,
ogg_write_trailer,
} ;
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
#if 0
static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) {
@@ -267,7 +267,7 @@
#endif
int libogg_init(void) {
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&ogg_oformat) ;
#endif
/* av_register_input_format(&ogg_iformat); */
Index: ogg2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ogg2.c 17 Jul 2005 22:24:36 -0000 1.9
+++ ogg2.c 23 Sep 2005 00:25:41 -0000 1.10
@@ -44,7 +44,7 @@
NULL
};
-#if 0 // CONFIG_ENCODERS
+#if 0 // CONFIG_MUXERS
static int
ogg_write_header (AVFormatContext * avfcontext)
{
@@ -74,7 +74,7 @@
ogg_write_packet,
ogg_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
//FIXME We could avoid some structure duplication
static int
@@ -638,7 +638,7 @@
int
ogg_init (void)
{
-#if 0 // CONFIG_ENCODERS
+#if 0 // CONFIG_MUXERS
av_register_output_format (&ogg_oformat);
#endif
av_register_input_format (&ogg_iformat);
Index: raw.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/raw.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- raw.c 17 Jul 2005 22:24:36 -0000 1.57
+++ raw.c 23 Sep 2005 00:25:41 -0000 1.58
@@ -18,7 +18,7 @@
*/
#include "avformat.h"
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* simple formats */
static int raw_write_header(struct AVFormatContext *s)
{
@@ -36,7 +36,7 @@
{
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* raw input */
static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
@@ -329,7 +329,7 @@
.extensions = "ac3",
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat ac3_oformat = {
"ac3",
"raw ac3",
@@ -342,7 +342,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat dts_iformat = {
"dts",
@@ -367,7 +367,7 @@
.value = CODEC_ID_H261,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat h261_oformat = {
"h261",
"raw h261",
@@ -380,7 +380,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat h263_iformat = {
"h263",
@@ -394,7 +394,7 @@
.value = CODEC_ID_H263,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat h263_oformat = {
"h263",
"raw h263",
@@ -407,7 +407,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat m4v_iformat = {
"m4v",
@@ -421,7 +421,7 @@
.value = CODEC_ID_MPEG4,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat m4v_oformat = {
"m4v",
"raw MPEG4 video format",
@@ -434,7 +434,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat h264_iformat = {
"h264",
@@ -448,7 +448,7 @@
.value = CODEC_ID_H264,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat h264_oformat = {
"h264",
"raw H264 video format",
@@ -461,7 +461,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat mpegvideo_iformat = {
"mpegvideo",
@@ -474,7 +474,7 @@
.value = CODEC_ID_MPEG1VIDEO,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat mpeg1video_oformat = {
"mpeg1video",
"MPEG video",
@@ -487,9 +487,9 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat mpeg2video_oformat = {
"mpeg2video",
"MPEG2 video",
@@ -502,7 +502,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
AVInputFormat mjpeg_iformat = {
"mjpeg",
@@ -516,7 +516,7 @@
.value = CODEC_ID_MJPEG,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat mjpeg_oformat = {
"mjpeg",
"MJPEG video",
@@ -529,7 +529,7 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* pcm formats */
@@ -547,7 +547,7 @@
.value = codec,\
};
-#if !defined(CONFIG_ENCODERS) && defined(CONFIG_DECODERS)
+#if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS)
#define PCMDEF(name, long_name, ext, codec) \
PCMINPUTDEF(name, long_name, ext, codec)
@@ -569,7 +569,7 @@
raw_write_packet,\
raw_write_trailer,\
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
#ifdef WORDS_BIGENDIAN
#define BE_DEF(s) s
@@ -638,7 +638,7 @@
.value = CODEC_ID_RAWVIDEO,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
AVOutputFormat rawvideo_oformat = {
"rawvideo",
"raw video format",
@@ -651,9 +651,9 @@
raw_write_packet,
raw_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
return 0;
@@ -676,12 +676,12 @@
raw_write_trailer,
.flags = AVFMT_NOFILE | AVFMT_RAWPICTURE,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
-#ifndef CONFIG_ENCODERS
+#ifndef CONFIG_MUXERS
#define av_register_output_format(format)
#endif
-#ifndef CONFIG_DECODERS
+#ifndef CONFIG_DEMUXERS
#define av_register_input_format(format)
#endif
Index: rm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/rm.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- rm.c 17 Jul 2005 22:24:36 -0000 1.48
+++ rm.c 23 Sep 2005 00:25:41 -0000 1.49
@@ -44,7 +44,7 @@
int remaining_len;
} RMContext;
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static void put_str(ByteIOContext *s, const char *tag)
{
put_be16(s,strlen(tag));
@@ -443,7 +443,7 @@
put_flush_packet(pb);
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/***************************************************/
@@ -969,7 +969,7 @@
rm_read_dts,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat rm_oformat = {
"rm",
"rm format",
@@ -982,13 +982,13 @@
rm_write_packet,
rm_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int rm_init(void)
{
av_register_input_format(&rm_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&rm_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: sgi.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/sgi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sgi.c 8 Jan 2005 14:21:33 -0000 1.4
+++ sgi.c 23 Sep 2005 00:25:41 -0000 1.5
@@ -260,7 +260,7 @@
return 0; /* not reached */
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static void write_sgi_header(ByteIOContext *f, const SGIInfo *info)
{
int i;
@@ -442,7 +442,7 @@
return 0;
}
-#endif // CONFIG_ENCODERS
+#endif // CONFIG_MUXERS
AVImageFormat sgi_image_format = {
"sgi",
@@ -450,9 +450,9 @@
sgi_probe,
sgi_read,
(1 << PIX_FMT_GRAY8) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_RGBA32),
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
sgi_write,
#else
NULL,
-#endif // CONFIG_ENCODERS
+#endif // CONFIG_MUXERS
};
Index: swf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/swf.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- swf.c 17 Jul 2005 22:24:36 -0000 1.28
+++ swf.c 23 Sep 2005 00:25:41 -0000 1.29
@@ -148,7 +148,7 @@
return 1;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static void put_swf_tag(AVFormatContext *s, int tag)
{
SWFContext *swf = s->priv_data;
@@ -691,7 +691,7 @@
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/*********************************************/
/* Extract FLV encoded frame and MP3 from swf
@@ -909,7 +909,7 @@
swf_read_close,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat swf_oformat = {
"swf",
"Flash format",
@@ -922,13 +922,13 @@
swf_write_packet,
swf_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int swf_init(void)
{
av_register_input_format(&swf_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&swf_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: wav.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- wav.c 2 Sep 2005 19:16:48 -0000 1.54
+++ wav.c 23 Sep 2005 00:25:41 -0000 1.55
@@ -46,7 +46,7 @@
{ 0, 0 },
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* WAVEFORMATEX header */
/* returns the size or -1 on error */
int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
@@ -135,7 +135,7 @@
return hdrsize;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* We could be given one of the three possible structures here:
* WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
@@ -194,7 +194,7 @@
return id;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
typedef struct {
offset_t data;
} WAVContext;
@@ -253,7 +253,7 @@
}
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* return the size of the found tag */
/* XXX: > 2GB ? */
@@ -395,7 +395,7 @@
wav_read_seek,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat wav_oformat = {
"wav",
"wav format",
@@ -408,13 +408,13 @@
wav_write_packet,
wav_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int ff_wav_init(void)
{
av_register_input_format(&wav_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&wav_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
Index: yuv4mpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/yuv4mpeg.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- yuv4mpeg.c 14 Aug 2005 15:42:40 -0000 1.25
+++ yuv4mpeg.c 23 Sep 2005 00:25:41 -0000 1.26
@@ -22,7 +22,7 @@
#define Y4M_FRAME_MAGIC "FRAME"
#define Y4M_LINE_MAX 256
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static int yuv4_generate_header(AVFormatContext *s, char* buf)
{
@@ -179,7 +179,7 @@
yuv4_write_trailer,
.flags = AVFMT_RAWPICTURE,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* Header size increased to allow room for optional flags */
#define MAX_YUV4_HEADER 80
@@ -393,9 +393,9 @@
int yuv4mpeg_init(void)
{
av_register_input_format(&yuv4mpegpipe_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&yuv4mpegpipe_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
More information about the ffmpeg-cvslog
mailing list