diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /libswscale/rgb2rgb.c | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'libswscale/rgb2rgb.c')
| -rw-r--r-- | libswscale/rgb2rgb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index faf3e95c64..19487d731d 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -27,11 +27,11 @@ */ #include <inttypes.h> #include "config.h" +#include "libavutil/x86_cpu.h" +#include "libavutil/bswap.h" #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" -#include "x86_cpu.h" -#include "bswap.h" #define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit |