On Sat, Apr 25, 2020 at 07:37:01PM -0700, Nelson Gomez wrote: > From: Nelson Gomez <nelson.go...@microsoft.com> > > Extracting information from SwsContext in assembly is difficult, and > rearranging SwsContext just for asm access didn't look good. These > functions only need a couple of fields from it anyway, so just make > them parameters in their own right. > > Signed-off-by: Nelson Gomez <nelson.go...@microsoft.com> > --- > libswscale/output.c | 12 +++++------- > libswscale/swscale_internal.h | 5 +++-- > libswscale/vscale.c | 2 +- > 3 files changed, 9 insertions(+), 10 deletions(-)
this doesnt apply cleanly anymore it seems Applying: swscale: make yuv2interleavedX more asm-friendly Using index info to reconstruct a base tree... M libswscale/output.c M libswscale/swscale_internal.h M libswscale/vscale.c Falling back to patching base and 3-way merge... Auto-merging libswscale/vscale.c CONFLICT (content): Merge conflict in libswscale/vscale.c Auto-merging libswscale/swscale_internal.h Auto-merging libswscale/output.c error: Failed to merge in the changes. Patch failed at 0001 swscale: make yuv2interleavedX more asm-friendly Use 'git am --show-current-patch' to see the failed 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 No great genius has ever existed without some touch of madness. -- Aristotle
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
