Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:28:10 +0000 (17:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:28:10 +0000 (17:28 +0200)
commit95398aa9499bfad3330b47001b7eb086c31b0cd6
tree0528f2243eea14e91cacc290ae713d2c2d4aa49d
parentbd148ce07de08dcd03178e869bacf1e1ef6358df
parentf792d3cbb8e8e35c54a9358a55dd596b7a40f228
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/adtsenc.c
libavformat/amr.c
libavformat/au.c
libavformat/latmenc.c
libavformat/mpjpeg.c
libavformat/omaenc.c
libavformat/rsoenc.c
libavformat/soxenc.c
libavformat/vocenc.c