Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
3d2c8734
Commit
3d2c8734
authored
Sep 17, 2008
by
hartman
Browse files
contrib: re-enable swscale, remove no longer needed swscale patch.
parent
8c5a9c72
Changes
2
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/Makefile
View file @
3d2c8734
...
...
@@ -1085,7 +1085,6 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
endif
ifdef
HAVE_DARWIN_OS
(
cd
$@
/libswscale
;
patch
-p0
< ../../Patches/ffmpeg-fix-noaltivec.patch
)
(
cd
$@
/libswscale
;
patch
-p0
< ../../Patches/ffmpeg-libswscale-head.patch
)
endif
ifdef
NO_TEXT_RELOCATION
(
cd
$@
;
patch
-p0
< ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch
)
...
...
@@ -1106,7 +1105,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
endif
FFMPEGCONF
=
--enable-gpl
--enable-postproc
--disable-vhook
--disable-ffserver
--disable-ffmpeg
--disable-ffplay
--disable-devices
--disable-protocols
--disable-network
--
dis
able-
filters
FFMPEGCONF
=
--enable-gpl
--enable-postproc
--disable-vhook
--disable-ffserver
--disable-ffmpeg
--disable-ffplay
--disable-devices
--disable-protocols
--disable-network
--
en
able-
swscale
ifdef
HAVE_WINCE
.ffmpeg
:
ffmpeg .zlib
...
...
extras/contrib/src/Patches/ffmpeg-libswscale-head.patch
deleted
100644 → 0
View file @
8c5a9c72
Index: swscale_template.c
===================================================================
--- swscale_template.c (revision 27579)
+++ swscale_template.c (working copy)
@@ -1904,7 +1904,7 @@
BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RU , GU<<5, BU<<10, RV , GV<<5, BV<<10, RGB2YUV_SHIFT+7)
#ifdef HAVE_MMX
-static inline void bgr24ToY_mmx(uint8_t *dst, uint8_t *src, long width, int srcFormat)
+static inline void RENAME(bgr24ToY_mmx)(uint8_t *dst, uint8_t *src, long width, int srcFormat)
{
if(srcFormat == PIX_FMT_BGR24){
@@ -1957,7 +1957,7 @@
);
}
-static inline void bgr24ToUV_mmx(uint8_t *dstU, uint8_t *dstV, uint8_t *src, long width, int srcFormat)
+static inline void RENAME(bgr24ToUV_mmx)(uint8_t *dstU, uint8_t *dstV, uint8_t *src, long width, int srcFormat)
{
asm volatile(
"movq 24+%4, %%mm6 \n\t"
@@ -2019,7 +2019,7 @@
static inline void RENAME(bgr24ToY)(uint8_t *dst, uint8_t *src, long width)
{
#ifdef HAVE_MMX
- bgr24ToY_mmx(dst, src, width, PIX_FMT_BGR24);
+ RENAME(bgr24ToY_mmx)(dst, src, width, PIX_FMT_BGR24);
#else
int i;
for (i=0; i<width; i++)
@@ -2036,7 +2036,7 @@
static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
{
#ifdef HAVE_MMX
- bgr24ToUV_mmx(dstU, dstV, src1, width, PIX_FMT_BGR24);
+ RENAME(bgr24ToUV_mmx)(dstU, dstV, src1, width, PIX_FMT_BGR24);
#else
int i;
for (i=0; i<width; i++)
@@ -2070,7 +2070,7 @@
static inline void RENAME(rgb24ToY)(uint8_t *dst, uint8_t *src, long width)
{
#ifdef HAVE_MMX
- bgr24ToY_mmx(dst, src, width, PIX_FMT_RGB24);
+ RENAME(bgr24ToY_mmx)(dst, src, width, PIX_FMT_RGB24);
#else
int i;
for (i=0; i<width; i++)
@@ -2089,7 +2089,7 @@
int i;
assert(src1==src2);
#ifdef HAVE_MMX
- bgr24ToUV_mmx(dstU, dstV, src1, width, PIX_FMT_RGB24);
+ RENAME(bgr24ToUV_mmx)(dstU, dstV, src1, width, PIX_FMT_RGB24);
#else
for (i=0; i<width; i++)
{
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment