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
3a94d061
Commit
3a94d061
authored
Jan 20, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update FFmpeg and fix the SSSE3/h264/EMU_EDGE issue
parent
56f4b016
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
76 additions
and
1 deletion
+76
-1
extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch
extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch
+74
-0
extras/contrib/src/contrib-src.mak
extras/contrib/src/contrib-src.mak
+1
-0
extras/contrib/src/packages.mak
extras/contrib/src/packages.mak
+1
-1
No files found.
extras/contrib/src/Patches/ffmpeg-h264-ssse3.patch
0 → 100644
View file @
3a94d061
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm
index afe6426..dbe6b8a 100644
--- a/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@ -1249,7 +1249,10 @@
cglobal pred8x8l_horizontal_%1, 4,4
sub r0, r3
lea r2, [r0+r3*2]
movq mm0, [r0+r3*1-8]
- punpckhbw mm0, [r0+r3*0-8]
+ test r1, r1
+ lea r1, [r0+r3]
+ cmovnz r1, r0
+ punpckhbw mm0, [r1+r3*0-8]
movq mm1, [r2+r3*1-8]
punpckhbw mm1, [r0+r3*2-8]
mov r2, r0
@@ -1264,21 +1267,12 @@
cglobal pred8x8l_horizontal_%1, 4,4
punpckhdq mm3, mm1
lea r0, [r0+r3*2]
movq mm0, [r0+r3*0-8]
- movq mm1, [r2]
+ movq mm1, [r1+r3*0-8]
mov r0, r2
movq mm4, mm3
movq mm2, mm3
PALIGNR mm4, mm0, 7, mm0
PALIGNR mm1, mm2, 1, mm2
- test r1, r1 ; top_left
- jnz .do_left
-.fix_lt_1:
- movq mm5, mm3
- pxor mm5, mm4
- psrlq mm5, 56
- psllq mm5, 48
- pxor mm1, mm5
-.do_left:
movq mm0, mm4
PRED4x4_LOWPASS mm2, mm1, mm4, mm3, mm5
movq mm4, mm0
@@ -2153,7 +2147,10 @@
cglobal pred8x8l_horizontal_up_%1, 4,4
sub r0, r3
lea r2, [r0+r3*2]
movq mm0, [r0+r3*1-8]
- punpckhbw mm0, [r0+r3*0-8]
+ test r1, r1
+ lea r1, [r0+r3]
+ cmovnz r1, r0
+ punpckhbw mm0, [r1+r3*0-8]
movq mm1, [r2+r3*1-8]
punpckhbw mm1, [r0+r3*2-8]
mov r2, r0
@@ -2168,21 +2165,12 @@
cglobal pred8x8l_horizontal_up_%1, 4,4
punpckhdq mm3, mm1
lea r0, [r0+r3*2]
movq mm0, [r0+r3*0-8]
- movq mm1, [r2]
+ movq mm1, [r1+r3*0-8]
mov r0, r2
movq mm4, mm3
movq mm2, mm3
PALIGNR mm4, mm0, 7, mm0
PALIGNR mm1, mm2, 1, mm2
- test r1, r1
- jnz .do_left
-.fix_lt_1:
- movq mm5, mm3
- pxor mm5, mm4
- psrlq mm5, 56
- psllq mm5, 48
- pxor mm1, mm5
-.do_left:
movq mm0, mm4
PRED4x4_LOWPASS mm2, mm1, mm4, mm3, mm5
movq mm4, mm0
extras/contrib/src/contrib-src.mak
View file @
3a94d061
...
@@ -1094,6 +1094,7 @@ endif
...
@@ -1094,6 +1094,7 @@ endif
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
sed
-i
"s/std=c99/std=gnu99/"
ffmpeg/configure
sed
-i
"s/std=c99/std=gnu99/"
ffmpeg/configure
endif
endif
(
cd
ffmpeg
;
patch
-p1
< ../Patches/ffmpeg-h264-ssse3.patch
)
touch
$@
touch
$@
ffmpeg-$(FFMPEG_VERSION).tar.gz
:
ffmpeg-$(FFMPEG_VERSION).tar.gz
:
...
...
extras/contrib/src/packages.mak
View file @
3a94d061
...
@@ -95,7 +95,7 @@ LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMA
...
@@ -95,7 +95,7 @@ LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMA
FFMPEG_VERSION
=
0.4.8
FFMPEG_VERSION
=
0.4.8
FFMPEG_URL
=
$(SF)
/ffmpeg/ffmpeg-
$(FFMPEG_VERSION)
.tar.gz
FFMPEG_URL
=
$(SF)
/ffmpeg/ffmpeg-
$(FFMPEG_VERSION)
.tar.gz
FFMPEG_SVN
=
svn://svn.ffmpeg.org/ffmpeg/trunk
FFMPEG_SVN
=
svn://svn.ffmpeg.org/ffmpeg/trunk
FFMPEG_SVN_REV
=
26
165
FFMPEG_SVN_REV
=
26
400
LIBDVDCSS_VERSION
=
1.2.10
LIBDVDCSS_VERSION
=
1.2.10
LIBDVDCSS_URL
=
$(VIDEOLAN)
/libdvdcss/
$(LIBDVDCSS_VERSION)
/libdvdcss-
$(LIBDVDCSS_VERSION)
.tar.bz2
LIBDVDCSS_URL
=
$(VIDEOLAN)
/libdvdcss/
$(LIBDVDCSS_VERSION)
/libdvdcss-
$(LIBDVDCSS_VERSION)
.tar.bz2
LIBDVDNAV_VERSION
=
4.1.1
LIBDVDNAV_VERSION
=
4.1.1
...
...
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