aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g726.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-06-13 19:30:27 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-06-13 19:30:27 +0000
commit5171fd9dd579687b4cd17c56e70a1ec6e3041553 (patch)
treeb6ab062550f9537512959cefb3cd1fc2bc7cdcc4 /libavcodec/g726.c
parentf059427cf013f3800c7637038fb5bd2a726eb5d1 (diff)
downloadffmpeg-5171fd9dd579687b4cd17c56e70a1ec6e3041553.tar.gz
-0x8000 == 0x8000 with int16
fixes segfault / issue491 Originally committed as revision 13767 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/g726.c')
-rw-r--r--libavcodec/g726.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 1a0d40d324..cb55a524dc 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -37,7 +37,7 @@ typedef struct Float11 {
int mant; /**< 6bit mantissa */
} Float11;
-static inline Float11* i2f(int16_t i, Float11* f)
+static inline Float11* i2f(int i, Float11* f)
{
f->sign = (i < 0);
if (f->sign)