On Wed, May 04, 2016 at 12:15:26AM +0000, Felt, Patrick wrote: > Afternoon all, > I apologize if this isn’t right way to submit a patch. Attached is a patch > for src_movie.c that modifies it to allow for one to use the > process_command() infrastructure to swap the input file on the fly. I’ve > added a few options to the filter and exposed filename to the process_command > subsystem. Useful for live streaming and “changing the channel”. >
patch doest apply: Applying: Add input swap functionality to movie filter (src_movie.c) fatal: corrupt patch at line 8 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Add input swap functionality to movie filter (src_movie.c) When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Everything should be made as simple as possible, but not simpler. -- Albert Einstein
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
