Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
ba5d10e5
Commit
ba5d10e5
authored
Feb 17, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the x264 patch.
parent
f5bfa4ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
42 deletions
+16
-42
extras/contrib/src/Patches/x264-svn-win32.patch
extras/contrib/src/Patches/x264-svn-win32.patch
+16
-42
No files found.
extras/contrib/src/Patches/x264-svn-win32.patch
View file @
ba5d10e5
...
...
@@ -139,42 +139,6 @@ Index: common/i386/dct-a.asm
+x264_mmx_2121: dw 2, 1, 2, 1
+x264_mmx_p2n2p1p1: dw 2, -2, 1, 1
+
Index: common/i386/pixel-sse2.asm
===================================================================
--- common/i386/pixel-sse2.asm (revision 346)
+++ common/i386/pixel-sse2.asm (working copy)
@@ -36,15 +36,6 @@
%endmacro
-%ifdef FORMAT_COFF
-SECTION .rodata data
-%else
-SECTION .rodata data align=16
-%endif
-
-pd_0000ffff: times 4 dd 0x0000ffff
-
-
SECTION .text
@@ -531,3 +522,15 @@
SATD_END
+;=============================================================================
+; Local Data (Read Only)
+;=============================================================================
+%ifdef FORMAT_COFF
+SECTION .rodata data
+%else
+SECTION .rodata data align=16
+%endif
+
+pd_0000ffff: times 4 dd 0x0000ffff
+
+
Index: common/i386/mc-a2.asm
===================================================================
--- common/i386/mc-a2.asm (revision 346)
...
...
@@ -264,7 +228,7 @@ Index: common/i386/mc-a2.asm
echo " --enable-avis-input enables avisynth input (win32 only)"
echo " --enable-mp4-output enables mp4 output (using gpac)"
echo " --enable-vfw compiles the VfW frontend"
@@ -58,47 +59,1
38
@@
@@ -58,47 +59,1
43
@@
EXE=""
...
...
@@ -350,6 +314,11 @@ Index: common/i386/mc-a2.asm
+ LDFLAGS="$LDFLAGS -pg"
+ gprof="yes"
+ ;;
+ --enable-pic)
+ CFLAGS="$CFLAGS -fPIC"
+ ASFLAGS="$ASFLAGS -D__PIC__"
+ pic="yes"
+ ;;
+ --enable-vfw)
+ vfw="yes"
+ ;;
...
...
@@ -446,10 +415,10 @@ Index: common/i386/mc-a2.asm
mips|mipsel)
ARCH="MIPS"
;;
@@ -1
70,129 +258
,6 @@
@@ -1
80,134 +273
,6 @@
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
-# parse options
-
-for opt do
...
...
@@ -508,6 +477,11 @@ Index: common/i386/mc-a2.asm
- LDFLAGS="$LDFLAGS -pg"
- gprof="yes"
- ;;
- --enable-pic)
- CFLAGS="$CFLAGS -fPIC"
- ASFLAGS="$ASFLAGS -D__PIC__"
- pic="yes"
- ;;
- --enable-vfw)
- vfw="yes"
- ;;
...
...
@@ -557,7 +531,7 @@ Index: common/i386/mc-a2.asm
- cc_check gpac/isomedia.h "$MP4_LDFLAGS" && mp4_output="yes"
-fi
-if [ "$mp4_output" = "yes" ] ; then
-
CFLAGS="$CFLAGS -DMP4_OUTPUT"
-
echo "#define MP4_OUTPUT" >> config.h
- LDFLAGS="$LDFLAGS $MP4_LDFLAGS"
-fi
-
...
...
@@ -569,7 +543,7 @@ Index: common/i386/mc-a2.asm
- fi
-fi
-if [ "$avis_input" = "yes" ] ; then
-
CFLAGS="$CFLAGS -DAVIS_INPUT"
-
echo "#define AVIS_INPUT" >> config.h
- LDFLAGS="$LDFLAGS -lvfw32"
-fi
-
...
...
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