From 6bcbe768bbc7ce615e2719fc491dad39af7c8d11 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 25 Sep 2012 02:45:46 +0200 Subject: [PATCH] lavf: dont add apic streams for demuxers that dont support it. Fixes crash Fixes ticket1730 Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2a8fac1e99..0eda2aeec6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -641,9 +641,13 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma if ((ret = s->iformat->read_header(s)) < 0) goto fail; - if (id3v2_extra_meta && - (ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0) - goto fail; + if (id3v2_extra_meta) { + if (!strcmp(s->iformat->name, "mp3")) { + if((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0) + goto fail; + } else + av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skiping\n"); + } ff_id3v2_free_extra_meta(&id3v2_extra_meta); avformat_queue_attached_pictures(s);