[FFmpeg-devel] "OPW Qualification Task: Enable daemon mode for FFserver"

Nicolas George george at nsup.org
Mon Nov 10 14:06:27 CET 2014

Le decadi 20 brumaire, an CCXXIII, Binathi Bingi a écrit :
> I use nano editor.

If you expect you will work on source codes (not necessarily just FFmpeg) a
lot, I believe taking the time of learning a better editor would be a very
good investment.

> I tried to remove trailing whitespace in git patch using "git format-patch
> -b -w -1"
> Please find the attached patch.

Unfortunately, that will not work: the -w option (and -b is just a subset)
will make diff consider that "foo" and "foo " are the same and not output a
pair of lines for them. But if you change "foo" into "bar ", or if you
insert "bar ", then diff must output a '+' line, and then it will output
"+foo ", not "+foo".

Furthermore, I am not sure it would have been a good idea anyway: the
trailing spaces could have leaked again somewhere, for example if you forget
-w sometimes. Better remove them as upstream as possible.

If your editor does not allow it directly, you can easily use sed to fix the

sed -i 's/  *$//' ffserver.c

> From c9d037758693a1522258a64849f7629d7cbd7408 Mon Sep 17 00:00:00 2001
> From: Binathi <binti179 at gmail.com>
> Date: Tue, 4 Nov 2014 21:42:07 +0530
> Subject: [PATCH] Restore Daemon mode in FFserver
> Signed-off-by: Binathi Bingi <binti179 at gmail.com>
> ---
>  doc/ffserver.conf |  5 +++++
>  doc/ffserver.texi |  7 ++++---
>  ffserver.c        | 33 +++++++++++++++++++++++++++++++++
>  ffserver_config.c |  4 +++-
>  ffserver_config.h |  1 +
>  5 files changed, 46 insertions(+), 4 deletions(-)

Apart from the trailing spaces problem, the code looks good to me now. In
normal circumstances, the trailing spaces could probably be removed by the
committer, but for a qualification task it is probably best to have the
patch committed as is.

Also, I other people have given comments on the patches, they should be
allowed some time to give advice if any.


  Nicolas George
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141110/c61ed8be/attachment.asc>

More information about the ffmpeg-devel mailing list