From 8fa641f8e8b38d48ddad7f58772aa06bc8b4bdf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Loarer?= <lll+ffmpeg@m4x.org>
Date: Thu, 30 Nov 2006 01:00:12 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20compile=20with=20--disable-muxers,=20patc?=
=?UTF-8?q?h=20by=20Lo=C3=AFc=20Le=20Loarer,=20lll+ffmpeg=20m4x=20org.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Originally committed as revision 7185 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/aviobuf.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index fe93546edd6..866641ad066 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 */
--
GitLab