diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-25 05:23:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-25 06:24:55 +0200 |
| commit | d1adad3cca407f493c3637e20ecd4f7124e69212 (patch) | |
| tree | 575d0af4bad68b88bad6d8aa016a8d14c2ea7355 /libswscale/rgb2rgb.h | |
| parent | d9d56036f3351af711261aa6e7a832017c00a34f (diff) | |
| download | ffmpeg-streaming-d1adad3cca407f493c3637e20ecd4f7124e69212.zip ffmpeg-streaming-d1adad3cca407f493c3637e20ecd4f7124e69212.tar.gz | |
Merge swscale bloatup
This will be cleaned up in the next merge
Authorship / merged commits:
commit f668afd4896ee65683619b6f165dda4cdd46766f
Author: Janne Grunau <janne-libav@jannau.net>
Date: Fri Apr 15 09:12:34 2011 +0200
swscale: fix "ISO C90 forbids mixed declarations and code" warning
only hit with --enable-runtime-cpudetect
commit 7f2ae5c7af374dfe254195a9375974a2ff9395a7
Author: Janne Grunau <janne-libav@jannau.net>
Date: Fri Apr 15 02:09:44 2011 +0200
swscale: fix compilation with --enable-runtime-cpudetect
commit b6cad3df822969b31bb93eaf677e52a72416bc97
Author: Janne Grunau <janne-libav@jannau.net>
Date: Fri Apr 15 00:31:04 2011 +0200
swscale: correct include path to fix ppc altivec build
commit 6216fc70b74e01a5272085329aa92f5ac797f9cf
Author: Luca Barbato <lu_zero@gentoo.org>
Date: Thu Apr 14 22:03:45 2011 +0200
swscale: simplify rgb2rgb templating
MMX is always built. Drop the ifdefs
commit 33a0421bbaa64f4e9c3d852b7f225ede8dad1388
Author: Josh Allmann <joshua.allmann@gmail.com>
Date: Wed Apr 13 20:57:32 2011 +0200
swscale: simplify initialization code
Simplify the fallthrough case when no accelerated functions
can be initialized.
commit 735bf1951171a1e0ee4292e84a1b1beac45dd0ab
Author: Josh Allmann <joshua.allmann@gmail.com>
Date: Wed Apr 13 20:57:31 2011 +0200
swscale: further cleanup swscale.c
Move x86-specific constants out of swscale.c
commit 86330b4c9258d5e583c0db033d1e68f46443307c
Author: Luca Barbato <lu_zero@gentoo.org>
Date: Wed Apr 13 20:57:30 2011 +0200
swscale: partially move the arch specific code left
PPC and x86 code is split off from swscale_template.c. Lots of code is
still duplicated and should be removed later.
Again uniformize the init system to be more similar to the dsputil one.
Unset h*scale_fast in the x86 init in order to make the output
consistent with the previous status. Thanks to Josh for spotting it.
commit c0038328830d7b341c28d7c99b0236a33617fd21
Author: Luca Barbato <lu_zero@gentoo.org>
Date: Wed Apr 13 20:57:29 2011 +0200
swscale: move away x86 specific code from rgb2rgb
Keep only the plain C code in the main rgb2rgb.c and move the x86
specific optimizations to x86/rgb2rgb.c
Change the initialization pattern a little so some of it can be
factorized to behave more like dsputils.
Conflicts:
libswscale/rgb2rgb.c
libswscale/swscale_template.c
Diffstat (limited to 'libswscale/rgb2rgb.h')
| -rw-r--r-- | libswscale/rgb2rgb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 31e21af..25bc396 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -168,4 +168,6 @@ extern void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const u void sws_rgb2rgb_init(int flags); +void rgb2rgb_init_x86(int flags); + #endif /* SWSCALE_RGB2RGB_H */ |
