[FFmpeg-devel] [PATCH] lavf/wavdec: skip padding byte

[Matthieu Bouron]

On Mon, Apr 08, 2013 at 01:46:04PM -0400, Derek Buitenhuis wrote:
> On 2013-04-08 1:44 PM, Matthieu Bouron wrote:
> > WAV chunks must be even aligned. This patch skip the extra padding byte
> > if chunk size is odd.
> 
> LGTM, as long as you add that to the commit message.
> 

Thanks for the review.
New patch attached with updated commit message.
-------------- next part --------------
>From 7c73c805bcfb9d2a0029908a845377a54c9d8dec Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bouron at gmail.com>
Date: Mon, 8 Apr 2013 18:27:11 +0200
Subject: [PATCH] lavf/wavdec: skip padding byte

WAV chunks must be even aligned. This patch skip the extra padding byte
if chunk size is odd.

Fixes ticket #2417.
---
 libavformat/wavdec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 782fa64..14c52f8 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -74,7 +74,7 @@ static int64_t find_tag(AVIOContext *pb, uint32_t tag1)
         size = next_tag(pb, &tag);
         if (tag == tag1)
             break;
-        avio_skip(pb, size);
+        avio_skip(pb, size + (size & 1));
     }
     return size;
 }
@@ -354,6 +354,9 @@ static int wav_read_header(AVFormatContext *s)
             break;
         }
 
+        /* skip padding byte */
+        next_tag_ofs += (next_tag_ofs < INT64_MAX && next_tag_ofs & 1);
+
         /* seek to next tag unless we know that we'll run into EOF */
         if ((avio_size(pb) > 0 && next_tag_ofs >= avio_size(pb)) ||
             avio_seek(pb, next_tag_ofs, SEEK_SET) < 0) {
-- 
1.8.2