diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2011-09-06 22:08:29 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-09-22 20:39:24 +0200 |
| commit | dcb9f6a20dbddd1f95b6b322fc4c5fd0b5315729 (patch) | |
| tree | 7bb02c8f5a792105bcec6202e547402731dffb9d | |
| parent | 59df4b82a5d2d614636076b0bd3e03aba400fc96 (diff) | |
| download | ffmpeg-dcb9f6a20dbddd1f95b6b322fc4c5fd0b5315729.tar.gz | |
Add LATM demuxer
This is a raw demuxer for the AAC LATM decoder and thus limited to
single stream LOAS.
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/rawdec.c | 12 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
5 files changed, 16 insertions, 3 deletions
@@ -42,7 +42,7 @@ easier to use. The changes are: * -intra option was removed, it's equivalent to -g 0. - XMV demuxer - Windows Media Image decoder -- LATM muxer +- LATM muxer/demuxer - showinfo filter - split filter - libcdio-paranoia input device for audio CD grabbing diff --git a/libavformat/Makefile b/libavformat/Makefile index 06c2027692..59dd42f643 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -109,6 +109,7 @@ OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o OBJS-$(CONFIG_IVF_MUXER) += ivfenc.o OBJS-$(CONFIG_JV_DEMUXER) += jvdec.o +OBJS-$(CONFIG_LATM_DEMUXER) += rawdec.o OBJS-$(CONFIG_LATM_MUXER) += latmenc.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o OBJS-$(CONFIG_LXF_DEMUXER) += lxfdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d640340cec..8e89b2f4ff 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -113,7 +113,7 @@ void av_register_all(void) REGISTER_DEMUXER (IV8, iv8); REGISTER_MUXDEMUX (IVF, ivf); REGISTER_DEMUXER (JV, jv); - REGISTER_MUXER (LATM, latm); + REGISTER_MUXDEMUX (LATM, latm); REGISTER_DEMUXER (LMLM4, lmlm4); REGISTER_DEMUXER (LXF, lxf); REGISTER_MUXDEMUX (M4V, m4v); diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 35df5e2462..9b3ef49fda 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -198,6 +198,18 @@ AVInputFormat ff_gsm_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, + .extensions = "latm", + .value = CODEC_ID_AAC_LATM, +}; +#endif + #if CONFIG_MJPEG_DEMUXER FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", CODEC_ID_MJPEG) #endif diff --git a/libavformat/version.h b/libavformat/version.h index 2d64826e32..82a07dbc32 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -24,7 +24,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 53 -#define LIBAVFORMAT_VERSION_MINOR 7 +#define LIBAVFORMAT_VERSION_MINOR 8 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |