diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-14 14:07:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-14 14:13:38 +0200 |
| commit | 509f502902e3760358d5c0c189f3d288652406e5 (patch) | |
| tree | c577f55e9db991afa1d1aaa0df4d6626e5155b10 /tools | |
| parent | 363307813e834314e85ac833dc17b4a8527c8559 (diff) | |
| parent | 58139e141bfd7116e527bae6a9f71c3b43fc8ff2 (diff) | |
| download | ffmpeg-509f502902e3760358d5c0c189f3d288652406e5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
trasher: Include all the necessary headers
x86: Remove some leftover declarations for non-existent functions
ARM: libavresample: NEON optimised generic fltp to s16 conversion
ARM: libavresample: NEON optimised stereo fltp to s16 conversion
ARM: libavresample: NEON optimised flat float to s16 conversion
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/trasher.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/trasher.c b/tools/trasher.c index 61fd395f28..93bfc0c3e4 100644 --- a/tools/trasher.c +++ b/tools/trasher.c @@ -21,6 +21,8 @@ #include <stdio.h> #include <stdlib.h> #include <inttypes.h> +#include <errno.h> +#include <string.h> static uint32_t state; static uint32_t ran(void) |