[FFmpeg-cvslog] w64dec: fix skipping of unknown guids

Paul B Mahol git at videolan.org
Thu Sep 5 23:12:50 CEST 2013


ffmpeg | branch: release/1.1 | Paul B Mahol <onemda at gmail.com> | Mon Sep  2 22:50:00 2013 +0000| [f1f8c0e558c6b888f8b7d87eadea7469570d6737] | committer: Carl Eugen Hoyos

w64dec: fix skipping of unknown guids

Regression since 14d50c1.
Fixes #2932.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 79b70e47a463057a3a48353ee1dd58671c11f86c)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1f8c0e558c6b888f8b7d87eadea7469570d6737
---

 libavformat/wavdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index e53d8da..ca1e8ed 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -655,7 +655,7 @@ static int w64_read_header(AVFormatContext *s)
             avio_skip(pb, end - avio_tell(pb));
         } else {
             av_log(s, AV_LOG_DEBUG, "unknown guid: "FF_PRI_GUID"\n", FF_ARG_GUID(guid));
-            avio_skip(pb, size - 24);
+            avio_skip(pb, FFALIGN(size, INT64_C(8)) - 24);
         }
     }
 



More information about the ffmpeg-cvslog mailing list