diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-12 04:51:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-12 04:51:24 +0200 |
| commit | 612122b187d711257eecd517e4049cef3bb0b7f0 (patch) | |
| tree | 2e0ed86f6f73bbc993a0e7787f331e21d1c7c064 /libavcodec/aaccoder.c | |
| parent | 4ea216e761e02d3f6973b316feaf3484be91a14f (diff) | |
| parent | 5705b02079449c685a3dd337fcc3a8b440dca4a0 (diff) | |
| download | android_external_ffmpeg-612122b187d711257eecd517e4049cef3bb0b7f0.tar.gz android_external_ffmpeg-612122b187d711257eecd517e4049cef3bb0b7f0.tar.bz2 android_external_ffmpeg-612122b187d711257eecd517e4049cef3bb0b7f0.zip | |
Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
10-bit H.264 x86 chroma v loopfilter asm
Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
Fix crash of interlaced MPEG2 decoding
h264pred: fix one more aliasing violation.
doc/APIchanges: fill in missing hashes and dates.
flacenc: use proper initializers for AVOption default values.
lavc: deprecate named constants for deprecated antialias_algo.
aac: workaround for compilation on cygwin
swscale: extend YUV422p support to 10bits depth
tiff: add support for inverted FillOrder for uncompressed data
Remove unused softfloat implementation.
h264pred: fix aliasing violations.
rotozoom: Eliminate French variable name.
rotozoom: Check return value of fread().
rotozoom: Return an error value instead of calling exit().
rotozoom: Make init_demo() return int and check for errors on invocation.
rotozoom: Drop silly UINT8 typedef.
rotozoom: Drop some unnecessary parentheses.
rotozoom: K&R coding style cosmetics
rtsp: Only do keepalive using GET_PARAMETER if the server supports it
...
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
doc/general.texi
ffmpeg.c
ffplay.c
libavcodec/h264pred_template.c
libavcodec/resample.c
libavutil/pixfmt.h
libavutil/softfloat.c
libavutil/softfloat.h
tests/rotozoom.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aaccoder.c')
| -rw-r--r-- | libavcodec/aaccoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 6d55acbc45..187b4ad972 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -30,6 +30,8 @@ * add sane pulse detection ***********************************/ +#include "libavutil/libm.h" // brought forward to work around cygwin header breakage + #include <float.h> #include <math.h> #include "avcodec.h" @@ -37,7 +39,6 @@ #include "aac.h" #include "aacenc.h" #include "aactab.h" -#include "libavutil/libm.h" /** bits needed to code codebook run value for long windows */ static const uint8_t run_value_bits_long[64] = { |