On Mon, Jan 09, 2012 at 04:38:55PM +0200, Yordan Makariev wrote: > --- > libavcodec/4xm.c | 788 > ++++++++++++++++++++++++---------------------- > libavdevice/timefilter.c | 86 +++--- > 2 files changed, 461 insertions(+), 413 deletions(-)
Your patch does not apply: ~/src/priv/libav $ git am -s yordan.mbox Applying: 4xm, timefilter: K&R formatting cosmetics error: patch failed: libavcodec/4xm.c:603 error: libavcodec/4xm.c: patch does not apply error: patch failed: libavdevice/timefilter.c:53 error: libavdevice/timefilter.c: patch does not apply Patch failed at 0001 4xm, timefilter: K&R formatting cosmetics 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". Apparently you created it against an old version of Libav and not against HEAD. You must rebase your tree against curent HEAD before sending in a fresh patch. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
