[FFmpeg-devel] Loongson Optimization Patchs and Machine Express Issuse

周晓勇 zhouxiaoyong at loongson.cn
Mon Apr 27 04:58:11 CEST 2015


The imgtec's msa optimization had changed the Makefile earlier than me, it's ok now.


> -----原始邮件-----
> 发件人: "Michael Niedermayer" <michael at niedermayer.cc>
> 发送时间: 2015年4月25日 星期六
> 收件人: "FFmpeg development discussions and patches" <ffmpeg-devel at ffmpeg.org>
> 抄送: gaoxiang <gaoxiang at loongson.cn>, "孟小甫" <mengxiaofu at loongson.cn>
> 主题: Re: [FFmpeg-devel] Loongson Optimization Patchs and Machine Express Issuse
> 
> On Wed, Apr 22, 2015 at 02:27:11PM +0800, 周晓勇 wrote:
> >  Makefile                 |    2 +-
> >  arch.mak                 |    1 +
> >  libavcodec/mips/Makefile |    2 ++
> >  3 files changed, 4 insertions(+), 1 deletion(-)
> > 26e64031017485302c85e184adcc941a26889962  0004-makefile-add-Loongson-3-support.patch
> > From aae2e408d57d79aac8760b03eac98b03e04451b1 Mon Sep 17 00:00:00 2001
> > From: ZhouXiaoyong <zhouxiaoyong at loongson.cn>
> > Date: Wed, 15 Apr 2015 20:26:31 +0800
> > Subject: [PATCH 04/11] makefile: add Loongson-3 support
> 
> doesnt apply cleanly:
> 
> Applying: makefile: add Loongson-3 support
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging libavcodec/mips/Makefile
> CONFLICT (content): Merge conflict in libavcodec/mips/Makefile
> Auto-merging arch.mak
> CONFLICT (content): Merge conflict in arch.mak
> Auto-merging Makefile
> CONFLICT (content): Merge conflict in Makefile
> Failed to merge in the changes.
> Patch failed at 0001 makefile: add Loongson-3 support
> 
> [...]
> 
> -- 
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
> 
> If you think the mosad wants you dead since a long time then you are either
> wrong or dead since a long time.



--
周晓勇 @系统研发部
Christian Zhou @System R & D

龙芯中科技术有限公司
Loongson Technology Corporation Limited

北京市海淀区温泉镇中关村环保科技示范园龙芯产业园2号楼
Loongson Industrial Park, building 2 , Zhongguancun Environmental protection park,
Haidian District, Beijing, China

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-makefile-add-Loongson-3-support.patch
Type: application/octet-stream
Size: 1360 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150427/ddd5c3fe/attachment.obj>


More information about the ffmpeg-devel mailing list