[FFmpeg-cvslog] avformat/librtmp: Fix build with --disable-network --enable-librtmp

Michael Niedermayer git at videolan.org
Fri Jan 23 17:58:15 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 23 17:45:35 2015 +0100| [d36e66bb2622d15e53d0a02a4685a8345cf93d7d] | committer: Michael Niedermayer

avformat/librtmp: Fix build with --disable-network --enable-librtmp

Found-by: Carl Eugen Hoyos <cehoyos at ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d36e66bb2622d15e53d0a02a4685a8345cf93d7d
---

 libavformat/librtmp.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 40073f3..bfa9a71 100644
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -28,7 +28,9 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
+#if CONFIG_NETWORK
 #include "network.h"
+#endif
 #include "url.h"
 
 #include <librtmp/rtmp.h>
@@ -232,10 +234,12 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
         goto fail;
     }
 
+#if CONFIG_NETWORK
     if (ctx->buffer_size >= 0 && (flags & AVIO_FLAG_WRITE)) {
         int tmp = ctx->buffer_size;
         setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp));
     }
+#endif
 
     s->is_streamed = 1;
     return 0;
@@ -318,7 +322,9 @@ static const AVOption options[] = {
     {"rtmp_swfurl", "URL of the SWF player. By default no value will be sent", OFFSET(swfurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
     {"rtmp_swfverify", "URL to player swf file, compute hash/size automatically. (unimplemented)", OFFSET(swfverify), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC},
     {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC},
+#if CONFIG_NETWORK
     {"rtmp_buffer_size", "set buffer size in bytes", OFFSET(buffer_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, DEC|ENC },
+#endif
     { NULL },
 };
 



More information about the ffmpeg-cvslog mailing list