diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-06-26 18:58:39 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-07-02 16:16:11 +0200 |
| commit | 02a951b919c4968f2b04abe834782759746e014b (patch) | |
| tree | 71fb1d46bd50c542d176a0632afb296225c01677 /libavformat | |
| parent | b72767df8e4f496da36138aa7127e408c1cde7f8 (diff) | |
| download | ffmpeg-02a951b919c4968f2b04abe834782759746e014b.tar.gz | |
apetag: export attached covers as video streams.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/apetag.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/libavformat/apetag.c b/libavformat/apetag.c index f8653d3ce7..bcce169e20 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -24,6 +24,7 @@ #include "libavutil/dict.h" #include "avformat.h" #include "apetag.h" +#include "internal.h" #define APE_TAG_VERSION 2000 #define APE_TAG_FOOTER_BYTES 32 @@ -56,6 +57,7 @@ static int ape_tag_read_field(AVFormatContext *s) return -1; if (flags & APE_TAG_FLAG_IS_BINARY) { uint8_t filename[1024]; + enum CodecID id; AVStream *st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -65,6 +67,27 @@ static int ape_tag_read_field(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Skipping binary tag '%s'.\n", key); return 0; } + + av_dict_set(&st->metadata, key, filename, 0); + + if ((id = ff_guess_image2_codec(filename)) != CODEC_ID_NONE) { + AVPacket pkt; + int ret; + + ret = av_get_packet(s->pb, &pkt, size); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Error reading cover art.\n"); + return ret; + } + + st->disposition |= AV_DISPOSITION_ATTACHED_PIC; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = id; + + st->attached_pic = pkt; + st->attached_pic.stream_index = st->index; + st->attached_pic.flags |= AV_PKT_FLAG_KEY; + } else { st->codec->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) return AVERROR(ENOMEM); @@ -73,8 +96,8 @@ static int ape_tag_read_field(AVFormatContext *s) return AVERROR(EIO); } st->codec->extradata_size = size; - av_dict_set(&st->metadata, key, filename, 0); st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; + } } else { value = av_malloc(size+1); if (!value) |