[FFmpeg-cvslog] Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 25 21:08:29 2014 +0200| [c9e0f7a080c1eb29e89ea2ba163d6b790ce1ff20] | committer: Michael Niedermayer

Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'

* commit '99e22b7859177f6d3ed6121040924b337dce5497':
  mov: Emit the correct tags for clcp tracks

Conflicts:
	libavformat/movenc.c

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

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