diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-04-03 16:11:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 02:25:56 +0200 |
| commit | 511585ce7f7272e5069ef011d6be5f073d268901 (patch) | |
| tree | 1d625358a59df9a7b70877bdd8395a448003ee36 /libavformat/matroskaenc.c | |
| parent | f62880bfb8c72ccbfdce4dd9daf93af691060ddd (diff) | |
| download | ffmpeg-511585ce7f7272e5069ef011d6be5f073d268901.tar.gz | |
matroskadec: export cover art correctly
Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.
Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.
Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.
Fixes trac #4423.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6b2e390e90..5493e3c631 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1270,6 +1270,11 @@ static int mkv_write_attachments(AVFormatContext *s) mimetype = ff_mkv_mime_tags[i].str; break; } + for (i = 0; ff_mkv_image_mime_tags[i].id != AV_CODEC_ID_NONE; i++) + if (ff_mkv_image_mime_tags[i].id == st->codec->codec_id) { + mimetype = ff_mkv_image_mime_tags[i].str; + break; + } } if (!mimetype) { av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and " |