Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Apr 2015 18:36:44 +0000 (20:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Apr 2015 18:37:24 +0000 (20:37 +0200)
commit8e1717cf12f88823b851cca706a2e5ab7aa1c7c4
tree5734faf6f4fa3402fa3273bf1d45aa9238b82cb9
parent79c11388e1f5d1af4dadf89f8a80d081f3a9ba4b
parentc4d37cd9ef6e374bb888f6273259b10fac5bd909
Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'

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

Conflicts:
libavformat/matroskadec.c

See: 511585ce7f7272e5069ef011d6be5f073d268901
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c