diff mbox

[FFmpeg-devel] avformat/aiffdec: AIFF fix in case of ANNO

Message ID 1514880907-6834-1-git-send-email-eduard@cloudinary.com
State New
Headers show

Commit Message

Eduard Sinelnikov Jan. 2, 2018, 8:15 a.m. UTC 
From: Author Name <eduard@cloudinary.com>

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.
---
 libavformat/aiffdec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Michael Niedermayer Jan. 4, 2018, 7:56 p.m. UTC | #1 
On Tue, Jan 02, 2018 at 08:15:07AM +0000, endushka@gmail.com wrote:

> From: Author Name <eduard@cloudinary.com>

This looks like unintended as commit author

[...]
diff mbox

Patch

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 99e05c7..20decc5 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);
 }