On Thu, Nov 30, 2017 at 11:07:03PM +0000, James Courtier-Dutton wrote: >
> segment.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > e3e9961df186f73adb24f7a334d398884e894d53 > 0001-libavformat-segment-strftime-date-sub-directories.patch > From b6a6f6d577e562c09c7cc1fc0befd2d73a9c0f32 Mon Sep 17 00:00:00 2001 > From: James Courtier-Dutton <james.dut...@gmail.com> > Date: Thu, 30 Nov 2017 22:56:04 +0000 > Subject: [PATCH] libavformat/segment: strftime date sub-directories > > Automatically create sub-directories if needed based on date. > E.g. > ffmpeg ... -timelimit 2147483647 -f segment -strftime 1 -segment_time 10 > "%Y/%m/%d/%Y-%m-%d_%H-%M-%S.mkv" > --- > libavformat/segment.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) doesnt apply anymore Applying: libavformat/segment: strftime date sub-directories Using index info to reconstruct a base tree... M libavformat/segment.c Falling back to patching base and 3-way merge... Auto-merging libavformat/segment.c CONFLICT (content): Merge conflict in libavformat/segment.c error: Failed to merge in the changes. Patch failed at 0001 libavformat/segment: strftime date sub-directories hint: Use 'git am --show-current-patch' to see the failed 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 When you are offended at any man's fault, turn to yourself and study your own failings. Then you will forget your anger. -- Epictetus
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
