diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 19:09:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 19:31:56 +0200 |
| commit | 9f088a1ed4d34f0cf4244a4b80960af9e8f23dfc (patch) | |
| tree | 049c8db5ee42c462bfe3d999146a224cff29bf03 /libpostproc/postprocess_template.c | |
| parent | e1a983e6010930ab742bede275de1ccf921485b7 (diff) | |
| parent | f69f4036f8cc3b673864dce01d2714fd5e49e8da (diff) | |
| download | ffmpeg-9f088a1ed4d34f0cf4244a4b80960af9e8f23dfc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: reduce excessive inlining of mpeg_motion()
mpegvideo: convert mpegvideo_common.h to a .c file
build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
Move MASK_ABS macro to libavcodec/mathops.h
x86: move MANGLE() and related macros to libavutil/x86/asm.h
x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
aacdec: Don't fall back to the old output configuration when no old configuration is present.
rtmp: Add message tracking
rtsp: Support mpegts in raw udp packets
rtsp: Support receiving plain data over UDP without any RTP encapsulation
rtpdec: Remove an unused include
rtpenc: Remove an av_abort() that depends on user-supplied data
vsrc_movie: discourage its use with avconv.
avconv: allow no input files.
avconv: prevent invalid reads in transcode_init()
avconv: rename OutputStream.is_past_recording_time to finished.
Conflicts:
configure
doc/filters.texi
ffmpeg.c
ffmpeg.h
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/mpegvideo.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess_template.c')
| -rw-r--r-- | libpostproc/postprocess_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 3419257c21..0fb2da4215 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -23,7 +23,7 @@ * mmx/mmx2/3dnow postprocess code. */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #undef REAL_PAVGB #undef PAVGB |