diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
| commit | 8102f27b5b3dff54f8099019c2df4701ac5e5d4f (patch) | |
| tree | f623e5063c24e6c4afc50338dfeecf7054c673a2 /libavcodec/arm/h264pred_init_arm.c | |
| parent | 24604ebaf85b5436d10da811f455dd710b353aca (diff) | |
| parent | 73b704ac609d83e0be124589f24efd9b94947cf9 (diff) | |
Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'
* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
arm: Add some missing header #includes
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/h264pred_init_arm.c')
| -rw-r--r-- | libavcodec/arm/h264pred_init_arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index 31714d73d5..20c1fde845 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -21,6 +21,7 @@ #include <stdint.h> #include "libavutil/arm/cpu.h" +#include "libavcodec/avcodec.h" #include "libavcodec/h264pred.h" void ff_pred16x16_vert_neon(uint8_t *src, ptrdiff_t stride); |