On 17/01/16 23:55, Michael Niedermayer wrote: > On Sun, Jan 17, 2016 at 10:45:37PM +0000, Mark Thompson wrote: >> From 45a803b627d0180c1aac928756924bd39ddf529d Mon Sep 17 00:00:00 2001 >> From: Mark Thompson <m...@jkqxz.net> >> Date: Sun, 17 Jan 2016 22:13:20 +0000 >> Subject: [PATCH 1/5] libavutil: some VAAPI infrastructure >> >> --- >> configure | 4 + >> libavutil/Makefile | 1 + >> libavutil/vaapi.c | 782 >> +++++++++++++++++++++++++++++++++++++++++++++++++++++ >> libavutil/vaapi.h | 119 ++++++++ >> 4 files changed, 906 insertions(+) >> create mode 100644 libavutil/vaapi.c >> create mode 100644 libavutil/vaapi.h > > tried to apply locally: > > Applying: libavutil: some VAAPI infrastructure > Using index info to reconstruct a base tree... > error: patch failed: configure:5739 > error: configure: patch does not apply > error: patch failed: libavutil/Makefile:146 > error: libavutil/Makefile: patch does not apply > Did you hand edit your patch? > It does not apply to blobs recorded in its index. > Cannot fall back to three-way merge. > Patch failed at 0001 libavutil: some VAAPI infrastructure > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". >
Sorry, MUA fail again. Push it through 's/^ //' before git am or similar. (Or copy out of the client directly to remove the format=flowed.) Hopefully good next time... Thanks, - Mark _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
