mirror of https://git.ffmpeg.org/ffmpeg.git
lavf: dont add apic streams for demuxers that dont support it.
Fixes crash Fixes ticket1730 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
dde8068856
commit
6bcbe768bb
|
@ -641,9 +641,13 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
|
||||||
if ((ret = s->iformat->read_header(s)) < 0)
|
if ((ret = s->iformat->read_header(s)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
if (id3v2_extra_meta &&
|
if (id3v2_extra_meta) {
|
||||||
(ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0)
|
if (!strcmp(s->iformat->name, "mp3")) {
|
||||||
goto fail;
|
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);
|
ff_id3v2_free_extra_meta(&id3v2_extra_meta);
|
||||||
|
|
||||||
avformat_queue_attached_pictures(s);
|
avformat_queue_attached_pictures(s);
|
||||||
|
|
Loading…
Reference in New Issue