[FFmpeg-cvslog] Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 17:28:10 2014 +0200| [95398aa9499bfad3330b47001b7eb086c31b0cd6] | committer: Michael Niedermayer

Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

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

Conflicts:
	libavformat/adtsenc.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95398aa9499bfad3330b47001b7eb086c31b0cd6
---