[FFmpeg-devel] ffserver jpg patch

[Michael Niedermayer]

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

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150511/226176e7/attachment.asc>