[FFmpeg-cvslog] Merge commit '330c18032464a4e1f3da907e54db2e69a6fbfcda' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 02:18:16 2014 +0200| [fe30351d528f2f7fb9d712db76856f24cfef3399] | committer: Michael Niedermayer

Merge commit '330c18032464a4e1f3da907e54db2e69a6fbfcda' into release/0.10

* commit '330c18032464a4e1f3da907e54db2e69a6fbfcda':
  matroskaenc: allow override of "writing application" tag
  avfilter: Add missing emms_c when needed
  mpeg12: check scantable indices in all decode_block functions

Conflicts:
	libavformat/matroskaenc.c

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

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