virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'

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

Conflicts:
	libavformat/matroskadec.c

See: 511585ce7f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-08 20:36:44 +02:00
commit 8e1717cf12
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/matroskadec.c
View File

@ -2159,6 +2159,8 @@ static int matroska_read_header(AVFormatContext *s)
} }
} }
attachments[j].stream = st;
if (st->codec->codec_id != AV_CODEC_ID_NONE) { if (st->codec->codec_id != AV_CODEC_ID_NONE) {
st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
@ -2174,7 +2176,7 @@ static int matroska_read_header(AVFormatContext *s)
if (ff_alloc_extradata(st->codec, attachments[j].bin.size)) if (ff_alloc_extradata(st->codec, attachments[j].bin.size))
break; break;
memcpy(st->codec->extradata, attachments[j].bin.data, 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++) { 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, if (!strncmp(ff_mkv_mime_tags[i].str, attachments[j].mime,
@ -2183,7 +2185,6 @@ static int matroska_read_header(AVFormatContext *s)
break; break;
} }
} }
attachments[j].stream = st;
} }
} }
} }