[FFmpeg-cvslog] lavf: Remove duplicated latm demuxer.
Carl Eugen Hoyos
git at videolan.org
Thu Oct 15 01:12:17 CEST 2015
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Oct 15 01:11:17 2015 +0200| [2c2d1624a2e70693045868b8b841a24a9b711507] | committer: Carl Eugen Hoyos
lavf: Remove duplicated latm demuxer.
The demuxer used to demux loas files for which a dedicated demuxer exists.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c2d1624a2e70693045868b8b841a24a9b711507
---
doc/APIchanges | 3 +++
libavformat/Makefile | 1 -
libavformat/allformats.c | 2 +-
libavformat/rawdec.c | 13 -------------
libavformat/version.h | 4 ++--
5 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 71b847d..b9cdce6 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first:
+2015-10-15 - xxxxxxx - lavf 57.4.100
+ Remove the latm demuxer that was a duplicate of the loas demuxer.
+
2015-10-14 - xxxxxxx - lavu 55.4.100 / lavu 55.2.0 - dict.h
Change return type of av_dict_copy() from void to int, so that a proper
error code can be reported.
diff --git a/libavformat/Makefile b/libavformat/Makefile
index d118019..c58cfb4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -227,7 +227,6 @@ OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o
OBJS-$(CONFIG_JACOSUB_DEMUXER) += jacosubdec.o subtitles.o
OBJS-$(CONFIG_JACOSUB_MUXER) += jacosubenc.o rawenc.o
OBJS-$(CONFIG_JV_DEMUXER) += jvdec.o
-OBJS-$(CONFIG_LATM_DEMUXER) += rawdec.o
OBJS-$(CONFIG_LATM_MUXER) += latmenc.o rawenc.o
OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o
OBJS-$(CONFIG_LOAS_DEMUXER) += loasdec.o rawdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 0ccde9d..5a18eeb 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -167,7 +167,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(IVF, ivf);
REGISTER_MUXDEMUX(JACOSUB, jacosub);
REGISTER_DEMUXER (JV, jv);
- REGISTER_MUXDEMUX(LATM, latm);
+ REGISTER_MUXER (LATM, latm);
REGISTER_DEMUXER (LMLM4, lmlm4);
REGISTER_DEMUXER (LOAS, loas);
REGISTER_MUXDEMUX(LRC, lrc);
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 7098ebd..e5c9918 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -123,19 +123,6 @@ AVInputFormat ff_data_demuxer = {
};
#endif
-#if CONFIG_LATM_DEMUXER
-
-AVInputFormat ff_latm_demuxer = {
- .name = "latm",
- .long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"),
- .read_header = ff_raw_audio_read_header,
- .read_packet = ff_raw_read_partial_packet,
- .flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS,
- .extensions = "latm",
- .raw_codec_id = AV_CODEC_ID_AAC_LATM,
-};
-#endif
-
#if CONFIG_MJPEG_DEMUXER
static int mjpeg_probe(AVProbeData *p)
{
diff --git a/libavformat/version.h b/libavformat/version.h
index e365636..6944cab 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,8 +30,8 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
-#define LIBAVFORMAT_VERSION_MINOR 3
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MINOR 4
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list