summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-04 17:29:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-04 22:18:58 +0100
commitd7e5301e438ffb39697b4834769e3f0e3a4e36bd (patch)
treeb17325ae4ca726e201d3e951cd1fb460479d7a38
parent6a3fed87498b425d19dee4b57d969e10e2dd5f43 (diff)
downloadffmpeg-d7e5301e438ffb39697b4834769e3f0e3a4e36bd.tar.gz
vorbis: Fix last quarter of CVE-2011-3893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6fcf2bb8af0e7d6bb179e71e67e5fab8ef0d2ec2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vorbis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 251442bfc3..9e5dfd8e7e 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -179,7 +179,7 @@ static inline void render_line_unrolled(intptr_t x, unsigned char y, int x1,
}
}
-static void render_line(int x0, int y0, int x1, int y1, float *buf)
+static void render_line(int x0, unsigned char y0, int x1, int y1, float *buf)
{
int dy = y1 - y0;
int adx = x1 - x0;