summaryrefslogtreecommitdiff
path: root/libavcodec/g722.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-15 01:07:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-15 01:16:54 +0100
commit4640da7e58509996ff03b1a0b018ca8f337391c7 (patch)
tree732195f8bc4987e4974df716789044c7e3db0836 /libavcodec/g722.c
parenta91f2066651416e0f9315e7fb0132587352c75dc (diff)
parent4cd0bdae9a62d1f0366e60603222762af31e5289 (diff)
downloadffmpeg-4640da7e58509996ff03b1a0b018ca8f337391c7.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: sgidec: Use bytestream2 functions to prevent buffer overreads. cosmetics: Move static and inline attributes to more standard places. configure: provide libavfilter/version.h header to get_version() swscale: change yuv2yuvX code to use cpuflag(). libx264: Don't leave max_b_frames as -1 if the user didn't set it FATE: convert output to rgba for the targa tests which currently output pal8 fate: add missing reference files for targa tests in 9c2f9b0e2 FATE: enable the 2 remaining targa conformance suite tests targa: add support for rgb555 palette FATE: fix targa tests on big-endian systems Conflicts: libavcodec/sgidec.c libavcodec/targa.c libswscale/x86/output.asm tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.c')
-rw-r--r--libavcodec/g722.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g722.c b/libavcodec/g722.c
index e8e74242b8..2c04c40b56 100644
--- a/libavcodec/g722.c
+++ b/libavcodec/g722.c
@@ -129,7 +129,7 @@ static void do_adaptive_prediction(struct G722Band *band, const int cur_diff)
band->prev_qtzd_reconst = cur_qtzd_reconst;
}
-static int inline linear_scale_factor(const int log_factor)
+static inline int linear_scale_factor(const int log_factor)
{
const int wd1 = inv_log2_table[(log_factor >> 6) & 31];
const int shift = log_factor >> 11;