diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-24 14:51:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-24 15:00:39 +0200 |
| commit | 15a0fb58a3294876c23989915a4a6202411be1b0 (patch) | |
| tree | 06270e6af9c4d446b75a573b39161664e60c6a13 /libavcodec/truespeech.c | |
| parent | bec180e1127f6753b5af1e6e5242020e0de12366 (diff) | |
| parent | 01cb4c84f54a52725c9b4b4dd6c609c36cccc5d4 (diff) | |
| download | ffmpeg-15a0fb58a3294876c23989915a4a6202411be1b0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideodec: Fix single symbol mode decoding
truespeech: drop useless casts
libavcodec: drop bogus dependencies from mpc[78] and qdm2
mpegaudio: move ff_mpa_enwindow to a separate file
AVOptions: store defaults for INT64 options in int64 union member.
Conflicts:
libavcodec/Makefile
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/truespeech.c')
| -rw-r--r-- | libavcodec/truespeech.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index 6a446b4e1d..6a1e439adf 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -182,7 +182,7 @@ static void truespeech_apply_twopoint_filter(TSContext *dec, int quart) off = av_clip(off, 0, 145); ptr0 = tmp + 145 - off; ptr1 = tmp + 146; - filter = (const int16_t*)ts_order2_coeffs + (t % 25) * 2; + filter = ts_order2_coeffs + (t % 25) * 2; for(i = 0; i < 60; i++){ t = (ptr0[0] * filter[0] + ptr0[1] * filter[1] + 0x2000) >> 14; ptr0++; @@ -207,7 +207,7 @@ static void truespeech_place_pulses(TSContext *dec, int16_t *out, int quart) } coef = dec->pulsepos[quart] >> 15; - ptr1 = (const int16_t*)ts_pulse_values + 30; + ptr1 = ts_pulse_values + 30; ptr2 = tmp; for(i = 0, j = 3; (i < 30) && (j > 0); i++){ t = *ptr1++; @@ -220,7 +220,7 @@ static void truespeech_place_pulses(TSContext *dec, int16_t *out, int quart) } } coef = dec->pulsepos[quart] & 0x7FFF; - ptr1 = (const int16_t*)ts_pulse_values; + ptr1 = ts_pulse_values; for(i = 30, j = 4; (i < 60) && (j > 0); i++){ t = *ptr1++; if(coef >= t) |