]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Fix compile with --disable-muxers, patch by Loïc Le Loarer, lll+ffmpeg m4x org.
authordiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Thu, 30 Nov 2006 01:00:12 +0000 (01:00 +0000)
committerdiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Thu, 30 Nov 2006 01:00:12 +0000 (01:00 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7185 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/aviobuf.c

index fe93546edd6dafb50f3b3c7d8304d2636369ca20..866641ad066fc2e140880bad9ab0b96aa6712382 100644 (file)
@@ -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 */