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 <zhouxiaoy...@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.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
