[FFmpeg-cvslog] avformat: fix stream_segment muxer build dependencies

James Almer git at videolan.org
Wed Feb 7 21:43:03 EET 2018


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Feb  7 16:42:11 2018 -0300| [cf666651b4992d41a8e6df47cc636116c07f78a1] | committer: James Almer

avformat: fix stream_segment muxer build dependencies

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavformat/Makefile  | 1 +
 libavformat/segment.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 1b35479715..f9a45338ec 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -474,6 +474,7 @@ OBJS-$(CONFIG_SRT_DEMUXER)               += srtdec.o subtitles.o
 OBJS-$(CONFIG_SRT_MUXER)                 += srtenc.o
 OBJS-$(CONFIG_STL_DEMUXER)               += stldec.o subtitles.o
 OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o
+OBJS-$(CONFIG_STREAM_SEGMENT_MUXER)      += segment.o
 OBJS-$(CONFIG_SUBVIEWER1_DEMUXER)        += subviewer1dec.o subtitles.o
 OBJS-$(CONFIG_SUBVIEWER_DEMUXER)         += subviewerdec.o subtitles.o
 OBJS-$(CONFIG_SUP_DEMUXER)               += supdec.o
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 8da4fca512..7fb4dc7d21 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -1064,6 +1064,7 @@ static const AVOption options[] = {
     { NULL },
 };
 
+#if CONFIG_SEGMENT_MUXER
 static const AVClass seg_class = {
     .class_name = "segment muxer",
     .item_name  = av_default_item_name,
@@ -1084,7 +1085,9 @@ AVOutputFormat ff_segment_muxer = {
     .check_bitstream = seg_check_bitstream,
     .priv_class     = &seg_class,
 };
+#endif
 
+#if CONFIG_STREAM_SEGMENT_MUXER
 static const AVClass sseg_class = {
     .class_name = "stream_segment muxer",
     .item_name  = av_default_item_name,
@@ -1105,3 +1108,4 @@ AVOutputFormat ff_stream_segment_muxer = {
     .check_bitstream = seg_check_bitstream,
     .priv_class     = &sseg_class,
 };
+#endif



More information about the ffmpeg-cvslog mailing list