Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'

[ffmpeg] / libavformat / aiffdec.c

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 2ef9386edb84e4914d1179de88200e6555df8d91..99e05c78ecac3528569fa1590afb6fff2a34ecd4 100644 (file)
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -258,7 +258,8 @@ static int aiff_read_header(AVFormatContext *s)
             position = avio_tell(pb);
             ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, size);
             if (id3v2_extra_meta)
-                if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0) {
+                if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0 ||
+                    (ret = ff_id3v2_parse_chapters(s, &id3v2_extra_meta)) < 0) {
                     ff_id3v2_free_extra_meta(&id3v2_extra_meta);
                     return ret;
                 }