[FFmpeg-cvslog] Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 02:42:15 2014 +0200| [403367d5a95c26b3c5d72ae7aca10bae0f58a827] | committer: Michael Niedermayer

Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'

* commit 'da9cc22d5bd5f59756c2037b02966376da2cf323':
  movenc: add track title to tracks

Conflicts:
	libavformat/movenc.c

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

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