From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 8 Apr 2015 18:36:44 +0000 (+0200)
Subject: Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'
X-Git-Tag: android-x86-7.1-r1~12334
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e1717cf12f88823b851cca706a2e5ab7aa1c7c4;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'

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

Conflicts:
	libavformat/matroskadec.c

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

8e1717cf12f88823b851cca706a2e5ab7aa1c7c4
diff --cc libavformat/matroskadec.c
index d869e5381e,7dac7beb99..396c1de9b8
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@@ -2171,10 -1910,13 +2173,10 @@@ static int matroska_read_header(AVForma
                  st->attached_pic.flags       |= AV_PKT_FLAG_KEY;
              } else {
                  st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
 -                st->codec->extradata  = av_malloc(attachments[j].bin.size);
 -                if (!st->codec->extradata)
 +                if (ff_alloc_extradata(st->codec, attachments[j].bin.size))
                      break;
 -
 -                st->codec->extradata_size = attachments[j].bin.size;
                  memcpy(st->codec->extradata, attachments[j].bin.data,
-                     attachments[j].bin.size);
+                        attachments[j].bin.size);
  
                  for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
                      if (!strncmp(ff_mkv_mime_tags[i].str, attachments[j].mime,