diff options
| author | Loïc Le Loarer <lll+ffmpeg@m4x.org> | 2006-11-30 01:00:12 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-11-30 01:00:12 +0000 |
| commit | 8fa641f8e8b38d48ddad7f58772aa06bc8b4bdf6 (patch) | |
| tree | 9e563f03d6ab7c04ea828de198b48cf34d7dff73 | |
| parent | 61710f7bb5f836b388c9e68ba327c1ffc98450fc (diff) | |
| download | ffmpeg-8fa641f8e8b38d48ddad7f58772aa06bc8b4bdf6.tar.gz | |
Fix compile with --disable-muxers, patch by Loïc Le Loarer, lll+ffmpeg m4x org.
Originally committed as revision 7185 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/aviobuf.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index fe93546edd..866641ad06 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -136,12 +136,12 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) fill_buffer(s); s->buf_ptr = s->buf_end + offset - s->pos; } else { -#ifdef CONFIG_MUXERS +#if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) if (s->write_flag) { flush_buffer(s); s->must_flush = 1; } else -#endif //CONFIG_MUXERS +#endif /* defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) */ { s->buf_end = s->buffer; } @@ -622,7 +622,9 @@ int url_fget_max_packet_size(ByteIOContext *s) return s->max_packet_size; } -#ifdef CONFIG_MUXERS +/* url_open_dyn_buf and url_close_dyn_buf are used in rtp.c to send a response + * back to the server even if CONFIG_MUXERS is not set. */ +#if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) /* buffer handling */ int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags) { @@ -785,4 +787,4 @@ int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer) av_free(d); return size; } -#endif //CONFIG_MUXERS +#endif /* CONFIG_MUXERS || CONFIG_NETWORK */ |