On Thu, 2010-04-08 at 00:06 +0200, Georg Martius wrote: > Hi, > > here are some improvements of the video stabilization stuff. > Patch created with hg export in branch 1_1. Should also work in 1.2.
Hi, unfortunately the patch doesn't apply cleanly: 21:55:39:fra...@samurai4:~/TC/HG/transcode-1.1.x$ hg branch transcode-1_1 21:55:41:fra...@samurai4:~/TC/HG/transcode-1.1.x$ hg heads changeset: 4060:80eb45d97a3c tag: tip parent: 4055:8d72b19450f2 user: achurch date: Wed Apr 07 06:17:00 2010 +0900 summary: [fix] Prevent the _FILE_OFFSET_BITS check from triggering on 64-bit systems. changeset: 4059:65caec1c33c0 branch: transcode-1_1 user: achurch date: Tue Apr 06 16:00:14 2010 +0900 summary: [fix] Fix audio encoding failure with -y ...,tcaud under recent ffmpeg. changeset: 3637:811790b764db branch: transcode-1_0 parent: 3626:d99b264c94d5 user: Francesco Romani <from...@gmail.com> date: Mon Mar 09 21:32:38 2009 +0100 summary: correct alpha usage: prevents segfault and solves bug #15007. changeset: 2165:72eace4a980a branch: new-module-system parent: 2144:9d93169a7f3a user: Francesco Romani <from...@gmail.com> date: Sat Apr 08 21:37:25 2006 +0000 summary: retire multiplexors from NMS since they are moving to HEAD changeset: 1167:d804b1a73502 branch: release-0_6_13-patches user: Andrew Church <achu...@achurch.org> date: Sun Jan 25 15:53:31 2009 +0900 summary: Added tag release-0_6_14 for changeset 9c54ed9e56fd 21:55:44:fra...@samurai4:~/TC/HG/transcode-1.1.x$ gzip -dc /tmp/transcode-1.1.X-stabilize-0.75.patch.gz | patch -p1 --dry-run patching file filter/stabilize/Changelog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file filter/stabilize/Changelog.rej patching file filter/stabilize/filter_stabilize.c Hunk #1 FAILED at 23. Hunk #2 FAILED at 37. Hunk #3 succeeded at 62 (offset -7 lines). Hunk #4 FAILED at 90. Hunk #5 succeeded at 107 (offset -10 lines). Hunk #6 FAILED at 129. Hunk #7 succeeded at 140 (offset -11 lines). Hunk #8 FAILED at 166. Hunk #9 FAILED at 184. Hunk #10 succeeded at 305 (offset -18 lines). Hunk #11 succeeded at 328 (offset -18 lines). Hunk #12 succeeded at 344 (offset -18 lines). Hunk #13 succeeded at 459 (offset -18 lines). Hunk #14 succeeded at 571 (offset -18 lines). Hunk #15 FAILED at 696. Hunk #16 succeeded at 722 (offset -24 lines). Hunk #17 FAILED at 920. Hunk #18 succeeded at 901 (offset -33 lines). Hunk #19 FAILED at 951. Hunk #20 succeeded at 958 (offset -37 lines). Hunk #21 succeeded at 995 (offset -37 lines). Hunk #22 FAILED at 1076. Hunk #23 succeeded at 1092 (offset -39 lines). Hunk #24 succeeded at 1141 (offset -39 lines). 10 out of 24 hunks FAILED -- saving rejects to file filter/stabilize/filter_stabilize.c.rej patching file filter/stabilize/filter_transform.c Hunk #1 FAILED at 21. Hunk #2 succeeded at 105 (offset -4 lines). Hunk #3 FAILED at 117. Hunk #4 FAILED at 767. Hunk #5 succeeded at 752 with fuzz 2 (offset -87 lines). 3 out of 5 hunks FAILED -- saving rejects to file filter/stabilize/filter_transform.c.rej patching file filter/stabilize/transform.c Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 3 out of 3 hunks ignored -- saving rejects to file filter/stabilize/transform.c.rej patching file filter/stabilize/transform.h +++ For now I can't do much more, but I'll hopefully find more time for hack during the weekend. :) Bests, -- Francesco Romani // Ikitt http://fromani.exit1.org ::: transcode homepage http://tcforge.berlios.de ::: transcode experimental forge
