Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
a9a76fbe
Commit
a9a76fbe
authored
Sep 23, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contribs: drop win64 patch for libswscale
parent
5eac86a0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
46 deletions
+0
-46
contrib/src/ffmpeg/ffmpeg-win64.patch
contrib/src/ffmpeg/ffmpeg-win64.patch
+0
-20
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+0
-3
extras/contrib/src/Patches/ffmpeg-win64.patch
extras/contrib/src/Patches/ffmpeg-win64.patch
+0
-20
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+0
-3
No files found.
contrib/src/ffmpeg/ffmpeg-win64.patch
deleted
100644 → 0
View file @
5eac86a0
Index: ffmpeg-svn/libswscale/swscale_template.c
===================================================================
--- ffmpeg-svn/libswscale/swscale_template.c (revision 31036)
+++ ffmpeg-svn/libswscale/swscale_template.c (working copy)
@@ -2466,6 +2466,7 @@
}
} else {
#endif /* COMPILE_TEMPLATE_MMX2 */
+#if 0
x86_reg xInc_shr16 = (x86_reg) (xInc >> 16);
uint16_t xInc_mask = xInc & 0xffff;
__asm__ volatile(
@@ -2501,6 +2502,7 @@
"r" (src2)
: "%"REG_a, "%"REG_d, "%ecx", "%"REG_D, "%esi"
);
+#endif
#if COMPILE_TEMPLATE_MMX2
} //if MMX2 can't be used
#endif
contrib/src/ffmpeg/rules.mak
View file @
a9a76fbe
...
...
@@ -116,9 +116,6 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
rm
-Rf
ffmpeg-git
mkdir
-p
ffmpeg-git
zcat
"
$<
"
|
(
cd
ffmpeg-git
&&
tar
xv
--strip-components
=
1
)
ifdef
HAVE_WIN64
$(APPLY)
$(SRC)
/ffmpeg/ffmpeg-win64.patch
endif
ifdef
HAVE_WIN32
sed
-i
"s/std=c99/std=gnu99/"
$@
-
$(FFMPEG_VERSION)
/configure
endif
...
...
extras/contrib/src/Patches/ffmpeg-win64.patch
deleted
100644 → 0
View file @
5eac86a0
Index: swscale_template.c
===================================================================
--- swscale_template.c (revision 31036)
+++ swscale_template.c (working copy)
@@ -2466,6 +2466,7 @@
}
} else {
#endif /* COMPILE_TEMPLATE_MMX2 */
+#if 0
x86_reg xInc_shr16 = (x86_reg) (xInc >> 16);
uint16_t xInc_mask = xInc & 0xffff;
__asm__ volatile(
@@ -2501,6 +2502,7 @@
"r" (src2)
: "%"REG_a, "%"REG_d, "%ecx", "%"REG_D, "%esi"
);
+#endif
#if COMPILE_TEMPLATE_MMX2
} //if MMX2 can't be used
#endif
extras/contrib/src/contrib-src.mak
View file @
a9a76fbe
...
...
@@ -1086,9 +1086,6 @@ ffmpeg:
ifdef
HAVE_ISA_THUMB
patch
-p0
< Patches/ffmpeg-avcodec-no-thumb.patch
endif
ifdef
HAVE_WIN64
(
cd
ffmpeg/libswscale
;
patch
-p0
< ../../Patches/ffmpeg-win64.patch
;
)
endif
ifdef
HAVE_UCLIBC
patch
-p0
< Patches/ffmpeg-svn-uclibc.patch
patch
-p0
< Patches/ffmpeg-svn-internal-define.patch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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