From: Derek Buitenhuis Date: Wed, 27 Apr 2016 14:49:40 +0000 (+0100) Subject: Merge commit '15b0517da986b312fc2fcb364a92db328380b15b' X-Git-Tag: android-x86-7.1-r1~5460 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=656b071a8f01c0269beb46d3fe00ded70fff079c;p=android-x86%2Fexternal-ffmpeg.git Merge commit '15b0517da986b312fc2fcb364a92db328380b15b' * commit '15b0517da986b312fc2fcb364a92db328380b15b': svq3: make the dsp functions static Merged-by: Derek Buitenhuis --- 656b071a8f01c0269beb46d3fe00ded70fff079c diff --cc libavcodec/svq3.c index 608f8172e2,df4616c3ae..492479d997 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@@ -163,9 -159,7 +162,9 @@@ static const uint32_t svq3_dequant_coef 61694, 68745, 77615, 89113, 100253, 109366, 126635, 141533 }; +static int svq3_decode_end(AVCodecContext *avctx); + - void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp) + static void svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp) { const int qmul = svq3_dequant_coeff[qp]; #define stride 16