[FFmpeg-cvslog] Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 01:41:55 2014 +0100| [4cb6814160d074df5d7cbb5b4a2059e7757bbaa6] | committer: Michael Niedermayer

Merge commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d'

* commit '0092c1dd8dac2d9e185b58503b447a0d3fb5230d':
  matroskaenc: allow override of "writing application" tag

Conflicts:
	libavformat/matroskaenc.c

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

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