On Sun, Oct 29, 2017 at 03:09:13PM +0100, Peter Große wrote: > On Sun, 29 Oct 2017 14:56:20 +0100 > Moritz Barsnick <barsn...@gmx.net> wrote: > > > On Sun, Oct 29, 2017 at 12:08:05 +0100, Peter Große wrote: > > > } else duration = 1; > > > > For style/readability, the statement should be on a new line, perhaps > > even with brackets. (Not necessarily as part of this patch though.) > > Sure. > > Regards > Peter
> ffmpeg.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > ad25b12935744d7c3a6b169bb7585c89f4f70c4d > 0001-ffmpeg.c-fix-code-style-in-seek_to_start.patch > From 14032f4185a0824b819b062068f5777a33057ece Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Peter=20Gro=C3=9Fe?= <pe...@friiks.de> > Date: Sun, 29 Oct 2017 15:07:12 +0100 > Subject: [PATCH] ffmpeg.c: fix code style in seek_to_start > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > To: ffmpeg-devel@ffmpeg.org > > Signed-off-by: Peter Große <pe...@friiks.de> > --- > fftools/ffmpeg.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) seems this doesnt apply Applying: ffmpeg.c: fix code style in seek_to_start error: sha1 information is lacking or useless (fftools/ffmpeg.c). error: could not build fake ancestor Patch failed at 0001 ffmpeg.c: fix code style in seek_to_start The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB There will always be a question for which you do not know the correct answer.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel