summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-02-07 16:42:11 -0300
committerJames Almer <jamrial@gmail.com>2018-02-07 16:42:11 -0300
commitcf666651b4992d41a8e6df47cc636116c07f78a1 (patch)
tree134ce0262daf2f3b1a6c7fee8f8ebfd059c89088
parent651d5f963921bbd547373380e1581df9bbc83199 (diff)
downloadffmpeg-streaming-cf666651b4992d41a8e6df47cc636116c07f78a1.zip
ffmpeg-streaming-cf666651b4992d41a8e6df47cc636116c07f78a1.tar.gz
avformat: fix stream_segment muxer build dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/Makefile1
-rw-r--r--libavformat/segment.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 1b35479..f9a4533 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 8da4fca..7fb4dc7 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
OpenPOWER on IntegriCloud