diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-15 01:11:17 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-15 01:11:17 +0200 |
| commit | 2c2d1624a2e70693045868b8b841a24a9b711507 (patch) | |
| tree | dff606a17e85610e8a325b71ac507102ee45b796 /libavformat | |
| parent | 83fc0b9d48d103f091211180bbe38f159790e62b (diff) | |
lavf: Remove duplicated latm demuxer.
The demuxer used to demux loas files for which a dedicated demuxer exists.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/rawdec.c | 13 | ||||
| -rw-r--r-- | libavformat/version.h | 4 |
4 files changed, 3 insertions, 17 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index d11801994f..c58cfb4ce9 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 0ccde9dfbc..5a18eebb7f 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 7098ebd402..e5c9918d75 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 e3656360c1..6944cabfa2 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, \ |