diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
| commit | 5c7e9e16c961f1f7258734426afac3cee4349580 (patch) | |
| tree | 20ea7bec723ef262bffb8f2447adcc1dc3d98069 /libavutil/ppc/float_dsp_init.c | |
| parent | 0e79fe37e5c5500db2e65ce6b7ea0bbdb3f24665 (diff) | |
| parent | e034cc6c60c77dce390b1ac31141b1862bdf8999 (diff) | |
| download | ffmpeg-5c7e9e16c961f1f7258734426afac3cee4349580.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Move vector_fmul_window to AVFloatDSPContext
rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/ppc/float_dsp_init.c')
| -rw-r--r-- | libavutil/ppc/float_dsp_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/ppc/float_dsp_init.c b/libavutil/ppc/float_dsp_init.c index d0ae788779..f84387a8ac 100644 --- a/libavutil/ppc/float_dsp_init.c +++ b/libavutil/ppc/float_dsp_init.c @@ -32,5 +32,9 @@ void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int bit_exact) return; fdsp->vector_fmul = ff_vector_fmul_altivec; + + if (!bit_exact) { + fdsp->vector_fmul_window = ff_vector_fmul_window_altivec; + } #endif } |