diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 9402bfb..a472a32 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -440,6 +440,7 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
       case CODEC_ID_AC3:
       case CODEC_ID_EAC3:
       case CODEC_ID_AAC:
+      case CODEC_ID_AAC_LATM:
       case CODEC_ID_DTS:
         maxchannels = 6;
         break;
@@ -961,6 +962,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
           "mpegversion", G_TYPE_INT, 4, NULL);
       break;
 
+    case CODEC_ID_AAC_LATM: /* LATM/LOAS AAC syntax */
+      caps = gst_ff_aud_caps_new (context, codec_id, "audio/mpeg",
+          "mpegversion", G_TYPE_INT, 4, "stream-format", G_TYPE_STRING, "loas", 
+	  NULL);
+      break;
+
     case CODEC_ID_ASV1:
       caps = gst_ff_vid_caps_new (context, codec_id, "video/x-asus",
           "asusversion", G_TYPE_INT, 1, NULL);
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 305178c..9527615 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -828,10 +828,11 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
   }
 
   /* for AAC we only use av_parse if not on raw caps */
-  if (oclass->in_plugin->id == CODEC_ID_AAC) {
+  if (oclass->in_plugin->id == CODEC_ID_AAC || oclass->in_plugin->id == CODEC_ID_AAC_LATM) {
     const gchar *format = gst_structure_get_string (structure, "stream-format");
-
-    if (format == NULL || strcmp (format, "raw") == 0) {
+    
+    if (format == NULL || strcmp (format, "raw") == 0 || 
+        oclass->in_plugin->id == CODEC_ID_AAC_LATM) {
       ffmpegdec->turnoff_parser = TRUE;
     }
   }
@@ -2134,7 +2135,7 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
 
   /* If we don't error out after the first failed read with the AAC decoder,
    * we must *not* carry on pushing data, else we'll cause segfaults... */
-  if (len == -1 && in_plugin->id == CODEC_ID_AAC) {
+  if (len == -1 && (in_plugin->id == CODEC_ID_AAC || in_plugin->id == CODEC_ID_AAC_LATM)) {
     GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, (NULL),
         ("Decoding of AAC stream by FFMPEG failed."));
     *ret = GST_FLOW_ERROR;
