It applies for me.
Konsole output
$ patch -p1 <patching.patch
patching file ffserver.c
patching file ffserver_config.c
patching file ffserver_config.h
Hunk #1 succeeded at 79 with fuzz 1.
patching file libavformat/allformats.c
patching file libavformat/rawenc.c
I also ran git format-patch -1 on it:
Konsole output
$ git format-patch -1 patching.patch
ill@compy:~/ffmpeggitmod$
and that worked without issue.
I still haven't gotten a reply about the author. Can I just set the
author as anybody or does it have to be someone specific?
On Sun, May 10, 2015 at 07:20:02PM -0600, ill wrote:
Can the patch be applied now?
please provide a patch which applies
this one does not (see below)
also make sure the patch is a proper git patch for example one
generated by "git format-patch -1"
also please make sure it has a matching commit message and a correctly
set author (this is important)
Applying: ffserver jpg patch
fatal: patch fragment without header at line 20: @@ -862,8 +862,10 @@ static
int ffserver_parse_config_stream(
Patch failed at 0001 ffserver jpg patch
The copy of the patch that failed is found in:
ffmpeg/.git/rebase-apply/patch
[...]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
