Index: contrib/ffmpeg/module.defs
===================================================================
--- contrib/ffmpeg/module.defs  (revision 6840)
+++ contrib/ffmpeg/module.defs  (working copy)
@@ -17,6 +17,7 @@
     --enable-gpl \
     --disable-doc \
     --disable-bsfs \
+    --enable-bsf=aac_adtstoasc \
     --disable-avconv \
     --disable-avplay \
     --disable-avprobe \
Index: libhb/muxavformat.c
===================================================================
--- libhb/muxavformat.c (revision 6840)
+++ libhb/muxavformat.c (working copy)
@@ -32,6 +32,8 @@

     int64_t  prev_chapter_tc;
     int16_t  current_chapter;
+
+    AVBitStreamFilterContext* aac_adtstoasc;
 };

 struct hb_mux_object_s
@@ -516,6 +518,9 @@
                 memcpy(priv_data,
                        audio->priv.config.extradata.bytes,
                        audio->priv.config.extradata.length);
+                if (audio->config.out.codec & HB_ACODEC_PASS_FLAG) {
+                    //track->aac_adtstoasc = av_bitstream_filter_init("aac_adtstoasc");
+                }
                 break;
             default:
                 hb_error("muxavformat: Unknown audio codec: %x",
@@ -1206,6 +1211,11 @@
     }
     track->duration = pts + pkt.duration;

+    if (track->aac_adtstoasc)
+    {
+        av_bitstream_filter_filter(track->aac_adtstoasc, track->st->codec, NULL, &pkt.data, &pkt.size, pkt.data, pkt.size, 0);
+    }
+
     pkt.stream_index = track->st->index;
     int ret = av_interleaved_write_frame(m->oc, &pkt);
     // Many avformat muxer functions do not check the error status
@@ -1244,6 +1254,10 @@
     for (ii = 0; ii < m->ntracks; ii++)
     {
         avformatMux(m, m->tracks[ii], NULL);
+        if (m->tracks[ii]->aac_adtstoasc)
+        {
+            av_bitstream_filter_close(m->tracks[ii]->aac_adtstoasc);
+        }
     }

     if (job->chapter_markers)