diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
| commit | e847f4128543432a77fb8f85c313646a406c76f6 (patch) | |
| tree | c23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /libavutil/arm/float_dsp_init_arm.c | |
| parent | 492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff) | |
| parent | 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff) | |
| download | ffmpeg-e847f4128543432a77fb8f85c313646a406c76f6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libspeexenc: add supported sample rates and channel layouts.
Replace usleep() calls with av_usleep()
lavu: add av_usleep() function
utvideo: mark interlaced frames as such
utvideo: Fix interlaced prediction for RGB utvideo.
cosmetics: do not use full path for local headers
lavu/file: include unistd.h only when available
configure: check for unistd.h
log: include unistd.h only when needed
lavf: include libavutil/time.h instead of redeclaring av_gettime()
Conflicts:
configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/utvideo.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_arm.c')
| -rw-r--r-- | libavutil/arm/float_dsp_init_arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c index ab636dbcd2..f721344b39 100644 --- a/libavutil/arm/float_dsp_init_arm.c +++ b/libavutil/arm/float_dsp_init_arm.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/arm/cpu.h" #include "libavutil/float_dsp.h" +#include "cpu.h" #include "float_dsp_arm.h" void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) |