diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2013-04-08 18:27:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 20:13:40 +0200 |
| commit | 1f2ce32825f7ca14c3bd90ef2781d75e8b704d41 (patch) | |
| tree | a7c90472d9dd588bfd99bf5b2ad321d1672bb576 /libavformat/wavdec.c | |
| parent | 0678c388bac79925a375594977cad3e41cd4c5bd (diff) | |
| download | ffmpeg-streaming-1f2ce32825f7ca14c3bd90ef2781d75e8b704d41.zip ffmpeg-streaming-1f2ce32825f7ca14c3bd90ef2781d75e8b704d41.tar.gz | |
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.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wavdec.c')
| -rw-r--r-- | libavformat/wavdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |
