[FFmpeg-devel] [PATCH 3/3] lavf: Depecate the live_flv demuxer
Derek Buitenhuis
derek.buitenhuis at gmail.com
Wed Nov 21 17:58:48 EET 2018
It is now the same as the regular FLV demuxer, and has no reason to exist.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
libavformat/allformats.c | 2 ++
libavformat/flvdec.c | 2 ++
libavformat/version.h | 3 +++
3 files changed, 7 insertions(+)
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 498077e1de..eff6a39b84 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -144,7 +144,9 @@ extern AVOutputFormat ff_flac_muxer;
extern AVInputFormat ff_flic_demuxer;
extern AVInputFormat ff_flv_demuxer;
extern AVOutputFormat ff_flv_muxer;
+#if FF_API_DEMUXER_LIVE_FLV
extern AVInputFormat ff_live_flv_demuxer;
+#endif
extern AVInputFormat ff_fourxm_demuxer;
extern AVOutputFormat ff_framecrc_muxer;
extern AVOutputFormat ff_framehash_muxer;
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 032e466bab..ac5a876ac5 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1317,6 +1317,7 @@ AVInputFormat ff_flv_demuxer = {
.flags = AVFMT_TS_DISCONT | AVFMT_NOBINSEARCH,
};
+#if FF_API_DEMUXER_LIVE_FLV
static const AVClass live_flv_class = {
.class_name = "live_flvdec",
.item_name = av_default_item_name,
@@ -1337,3 +1338,4 @@ AVInputFormat ff_live_flv_demuxer = {
.priv_class = &live_flv_class,
.flags = AVFMT_TS_DISCONT
};
+#endif
diff --git a/libavformat/version.h b/libavformat/version.h
index 843f922f9c..1a0c004e8e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -103,6 +103,9 @@
#ifndef FF_API_LAVF_MP4A_LATM
#define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
+#ifndef FF_API_DEMUXER_LIVE_FLV
+#define FF_API_DEMUXER_LIVE_FLV (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
#ifndef FF_API_R_FRAME_RATE
--
2.19.1
More information about the ffmpeg-devel
mailing list