[FFmpeg-cvslog] Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 13:07:26 2014 +0200| [375d7ee8056ad087f16ba7320a9b3dca8aa86512] | committer: Michael Niedermayer

Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'

* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
  mov: Clarify tkhd flag settings

Conflicts:
	libavformat/movenc.c

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

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