From 7fcbebbeafd106d5bab82b272076f7ceb5bc4a73 Mon Sep 17 00:00:00 2001 From: Eduard Sinelnikov Date: Mon, 8 Jan 2018 14:03:40 +0000 Subject: avformat/aiffdec: AIFF fix in case of ANNO Apple's AIFF protocol clearly states that each chucnk which is odd sized a padding should be added. In the old version of aiffdec adding of padding was done in `get_meta`. And in case of unknown chunk name it was done in defalut case. The new version has deleted the padding in default case and added padding adding after the switch. But the new version didn't removed the padding adding in the `get_meta` function so in some cases padding was added twice which leaded to a bug. Fixes: sample.aiff Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavformat/aiffdec.c') diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index e87fbc5661..7c701e0c70 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -81,11 +81,10 @@ static void get_meta(AVFormatContext *s, const char *key, int size) av_free(str); return; } - size += (size&1)-res; + size -= res; str[res] = 0; av_dict_set(&s->metadata, key, str, AV_DICT_DONT_STRDUP_VAL); - }else - size+= size&1; + } avio_skip(s->pb, size); } -- cgit v1.2.3