diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:16:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:16:32 +0200 |
| commit | 04fa81877913798bf4badfa472c8653219f2aeb1 (patch) | |
| tree | 875c341ee83d0b4916b59a40fad7e4a58c9aeac4 /libavcodec/ra144.c | |
| parent | cae8f469fee7c32685f04a2b507251119d6875ef (diff) | |
| parent | 088f38a4f9f54bb923405c67c9e72d96d90aa284 (diff) | |
| download | ffmpeg-04fa81877913798bf4badfa472c8653219f2aeb1.tar.gz | |
Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'
* commit '088f38a4f9f54bb923405c67c9e72d96d90aa284':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra144.c')
| -rw-r--r-- | libavcodec/ra144.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 58cf377f2d..fe9a5bcb3c 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -1504,8 +1504,8 @@ const int16_t * const ff_lpc_refl_cb[10]={ lpc_refl_cb6, lpc_refl_cb7, lpc_refl_cb8, lpc_refl_cb9, lpc_refl_cb10 }; -static void ff_add_wav(int16_t *dest, int n, int skip_first, int *m, const int16_t *s1, - const int8_t *s2, const int8_t *s3) +static void add_wav(int16_t *dest, int n, int skip_first, int *m, + const int16_t *s1, const int8_t *s2, const int8_t *s3) { int i; int v[3]; @@ -1716,8 +1716,8 @@ void ff_subblock_synthesis(RA144Context *ractx, const int16_t *lpc_coefs, block = ractx->adapt_cb + BUFFERSIZE - BLOCKSIZE; - ff_add_wav(block, gain, cba_idx, m, cba_idx? buffer_a: NULL, - ff_cb1_vects[cb1_idx], ff_cb2_vects[cb2_idx]); + add_wav(block, gain, cba_idx, m, cba_idx? buffer_a: NULL, + ff_cb1_vects[cb1_idx], ff_cb2_vects[cb2_idx]); memcpy(ractx->curr_sblock, ractx->curr_sblock + BLOCKSIZE, LPC_ORDER*sizeof(*ractx->curr_sblock)); |