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 /libavcodec/mips | |
| parent | 0e79fe37e5c5500db2e65ce6b7ea0bbdb3f24665 (diff) | |
| parent | e034cc6c60c77dce390b1ac31141b1862bdf8999 (diff) | |
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 'libavcodec/mips')
| -rw-r--r-- | libavcodec/mips/dsputil_mips.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mips/dsputil_mips.c b/libavcodec/mips/dsputil_mips.c index 76dc664e60..47501d5a70 100644 --- a/libavcodec/mips/dsputil_mips.c +++ b/libavcodec/mips/dsputil_mips.c @@ -163,6 +163,6 @@ static void vector_fmul_window_mips(float *dst, const float *src0, av_cold void ff_dsputil_init_mips( DSPContext* c, AVCodecContext *avctx ) { #if HAVE_INLINE_ASM - c->vector_fmul_window = vector_fmul_window_mips; +// c->vector_fmul_window = vector_fmul_window_mips; #endif } |