@@ -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

@@ -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

@@ -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);

@@ -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

@@ -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, \