Commit 8fa641f8 authored by Loïc Le Loarer's avatar Loïc Le Loarer Committed by Diego Biurrun

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
parent 61710f7b
...@@ -136,12 +136,12 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) ...@@ -136,12 +136,12 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
fill_buffer(s); fill_buffer(s);
s->buf_ptr = s->buf_end + offset - s->pos; s->buf_ptr = s->buf_end + offset - s->pos;
} else { } else {
#ifdef CONFIG_MUXERS #if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK)
if (s->write_flag) { if (s->write_flag) {
flush_buffer(s); flush_buffer(s);
s->must_flush = 1; s->must_flush = 1;
} else } else
#endif //CONFIG_MUXERS #endif /* defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) */
{ {
s->buf_end = s->buffer; s->buf_end = s->buffer;
} }
...@@ -622,7 +622,9 @@ int url_fget_max_packet_size(ByteIOContext *s) ...@@ -622,7 +622,9 @@ int url_fget_max_packet_size(ByteIOContext *s)
return s->max_packet_size; 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 */ /* buffer handling */
int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags) 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) ...@@ -785,4 +787,4 @@ int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer)
av_free(d); av_free(d);
return size; return size;
} }
#endif //CONFIG_MUXERS #endif /* CONFIG_MUXERS || CONFIG_NETWORK */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment