diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 21:09:39 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 21:31:56 +0400 |
| commit | 9f088a1ed4d34f0cf4244a4b80960af9e8f23dfc (patch) | |
| tree | 049c8db5ee42c462bfe3d999146a224cff29bf03 /libswscale | |
| parent | e1a983e6010930ab742bede275de1ccf921485b7 (diff) | |
| parent | f69f4036f8cc3b673864dce01d2714fd5e49e8da (diff) | |
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 'libswscale')
| -rw-r--r-- | libswscale/utils.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/rgb2rgb.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/yuv2rgb.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 2e387b52eb..1e3b718232 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -46,7 +46,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 9e4938a81a..24b284eec7 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -27,7 +27,7 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #include "libavutil/bswap.h" #include "libswscale/rgb2rgb.h" diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 132ec3e570..67cda51ca5 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -25,7 +25,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 8cb7f1ae0d..9445d08e84 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -34,7 +34,7 @@ #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" #include "libavutil/attributes.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #if HAVE_INLINE_ASM |