On Wed, Nov 22, 2017 at 07:12:01PM +0800, Shengbin Meng wrote: > From: Meng Wang <wangmeng.k...@bytedance.com> > > Signed-off-by: Meng Wang <wangmeng.k...@bytedance.com> > --- > libavcodec/arm/hevcdsp_init_neon.c | 66 +++++ > libavcodec/arm/hevcdsp_qpel_neon.S | 509 > +++++++++++++++++++++++++++++++++++++ > 2 files changed, 575 insertions(+) > > diff --git a/libavcodec/arm/hevcdsp_init_neon.c > b/libavcodec/arm/hevcdsp_init_neon.c
This seems not to apply to git master Applying: avcodec/hevcdsp: Add NEON optimization for qpel weighted mode Using index info to reconstruct a base tree... M libavcodec/arm/hevcdsp_init_neon.c Falling back to patching base and 3-way merge... Auto-merging libavcodec/arm/hevcdsp_init_neon.c CONFLICT (content): Merge conflict in libavcodec/arm/hevcdsp_init_neon.c error: Failed to merge in the changes. Patch failed at 0001 avcodec/hevcdsp: Add NEON optimization for qpel weighted mode The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I am the wisest man alive, for I know one thing, and that is that I know nothing. -- Socrates
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
