[FFmpeg-cvslog] Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  8 20:36:44 2015 +0200| [8e1717cf12f88823b851cca706a2e5ab7aa1c7c4] | committer: Michael Niedermayer

Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'

* commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909':
  matroskadec: export cover art correctly

Conflicts:
	libavformat/matroskadec.c

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

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