[FFmpeg-cvslog] Merge commit 'd375d6395c0a5203932d89c087f77a5757a08138' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:34:29 2014 +0200| [8ca0d74d5945339c70539d363d9132470731c8da] | committer: Michael Niedermayer

Merge commit 'd375d6395c0a5203932d89c087f77a5757a08138' into release/1.1

* commit 'd375d6395c0a5203932d89c087f77a5757a08138':
  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=8ca0d74d5945339c70539d363d9132470731c8da
---