diff options
author | Diego Biurrun <diego@biurrun.de> | 2005-09-23 00:25:41 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2005-09-23 00:25:41 +0000 |
commit | a9e350952992f07f4b560385185f406fbbb752d7 (patch) | |
tree | 05d33876774bc092ffee92ecabd160ae3dc2205c /libavformat/aviobuf.c | |
parent | 288f1e6815fc52196fd1f443d305a4822bf371a2 (diff) | |
download | ffmpeg-streaming-a9e350952992f07f4b560385185f406fbbb752d7.zip ffmpeg-streaming-a9e350952992f07f4b560385185f406fbbb752d7.tar.gz |
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.
Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/aviobuf.c')
-rw-r--r-- | libavformat/aviobuf.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f6f65c1..cead878 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -54,7 +54,7 @@ int init_put_byte(ByteIOContext *s, } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void flush_buffer(ByteIOContext *s) { if (s->buf_ptr > s->buffer) { @@ -104,7 +104,7 @@ void put_flush_packet(ByteIOContext *s) 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 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) 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 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) 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 @@ int url_ferror(ByteIOContext *s) 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 @@ void put_tag(ByteIOContext *s, const char *tag) put_byte(s, *tag++); } } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* Input stream */ @@ -463,7 +463,7 @@ uint64_t get_be64(ByteIOContext *s) /* 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 @@ static int url_write_packet(void *opaque, uint8_t *buf, int buf_size) } #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 @@ URLContext *url_fileno(ByteIOContext *s) 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 @@ int url_fprintf(ByteIOContext *s, const char *fmt, ...) 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 @@ int url_fget_max_packet_size(ByteIOContext *s) 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 @@ int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer) av_free(d); return size; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS |