Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
c7b1d976
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c7b1d976
编写于
7月 22, 2010
作者:
L
Loren Merritt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
relicense h264 deblock sse2 to lgpl
Originally committed as revision 24408 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
a33e0365
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
15 deletion
+19
-15
libavcodec/x86/Makefile
libavcodec/x86/Makefile
+3
-3
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.c
+3
-1
libavcodec/x86/h264_deblock_sse2.asm
libavcodec/x86/h264_deblock_sse2.asm
+13
-11
未找到文件。
libavcodec/x86/Makefile
浏览文件 @
c7b1d976
...
...
@@ -6,10 +6,10 @@ YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
YASM-OBJS-FFT-$(HAVE_SSE)
+=
x86/fft_sse.o
YASM-OBJS-$(CONFIG_FFT)
+=
x86/fft_mmx.o
\
$
(
YASM-OBJS-FFT-yes
)
YASM-OBJS-$(CONFIG_GPL)
+=
x86/h264_deblock_sse2.o
\
x86/h264_idct_sse2.o
\
YASM-OBJS-$(CONFIG_GPL)
+=
x86/h264_idct_sse2.o
\
YASM-OBJS-$(CONFIG_H264DSP)
+=
x86/h264_intrapred.o
\
YASM-OBJS-$(CONFIG_H264DSP)
+=
x86/h264_deblock_sse2.o
\
x86/h264_intrapred.o
\
YASM-OBJS-$(CONFIG_VC1_DECODER)
+=
x86/vc1dsp_yasm.o
...
...
libavcodec/x86/dsputil_mmx.c
浏览文件 @
c7b1d976
...
...
@@ -2999,7 +2999,7 @@ void ff_h264dsp_init_x86(H264DSPContext *c)
c
->
h264_idct8_add4
=
ff_h264_idct8_add4_sse2
;
}
#if
CONFIG_GPL &&
HAVE_YASM
#if HAVE_YASM
if
(
mm_flags
&
FF_MM_MMX2
){
#if ARCH_X86_32
c
->
h264_v_loop_filter_luma_intra
=
ff_x264_deblock_v_luma_intra_mmxext
;
...
...
@@ -3012,9 +3012,11 @@ void ff_h264dsp_init_x86(H264DSPContext *c)
c
->
h264_v_loop_filter_luma_intra
=
ff_x264_deblock_v_luma_intra_sse2
;
c
->
h264_h_loop_filter_luma_intra
=
ff_x264_deblock_h_luma_intra_sse2
;
#endif
#if CONFIG_GPL
c
->
h264_idct_add16
=
ff_h264_idct_add16_sse2
;
c
->
h264_idct_add8
=
ff_h264_idct_add8_sse2
;
c
->
h264_idct_add16intra
=
ff_h264_idct_add16intra_sse2
;
#endif
}
}
#endif
...
...
libavcodec/x86/h264_deblock_sse2.asm
浏览文件 @
c7b1d976
...
...
@@ -5,20 +5,22 @@
;*
;* Authors: Loren Merritt <lorenm@u.washington.edu>
;*
;* This program is free software; you can redistribute it and/or modify
;* it under the terms of the GNU General Public License as published by
;* the Free Software Foundation; either version 2 of the License, or
;* (at your option) any later version.
;* This file is part of FFmpeg.
;*
;* This program is distributed in the hope that it will be useful,
;* FFmpeg is free software; you can redistribute it and/or
;* modify it under the terms of the GNU Lesser General Public
;* License as published by the Free Software Foundation; either
;* version 2.1 of the License, or (at your option) any later version.
;*
;* FFmpeg is distributed in the hope that it will be useful,
;* but WITHOUT ANY WARRANTY; without even the implied warranty of
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;*
GNU
General Public License for more details.
;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
;*
Lesser
General Public License for more details.
;*
;* You should have received a copy of the GNU
General Public License
;*
along with this program
; if not, write to the Free Software
;*
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
;*****************************************************************************
;* You should have received a copy of the GNU
Lesser General Public
;*
License along with FFmpeg
; if not, write to the Free Software
;*
51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;*****************************************************************************
*
%include "x86inc.asm"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录