Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228':
  lavf: add the notimestamps flag to the muxers missing it

Conflicts:
	libavformat/adtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/au.c

@@ -220,6 +220,7 @@ AVOutputFormat ff_au_muxer = {
     .write_packet  = ff_raw_write_packet,
     .write_trailer = au_write_trailer,
     .codec_tag     = (const AVCodecTag* const []) { codec_au_tags, 0 },
+    .flags         = AVFMT_NOTIMESTAMPS,
 };
 
 #endif /* CONFIG_AU_MUXER */