search

sr229 / animegrep

extracts video clips in anime (anything that is mkv with subtitles) by parsing and grepping the subtitle file for a chosen word. Uses mkvextract and ffmpeg to both extract the subtitles and create the clips. This fork adds further fixes within the pipeline.
https://git.danieljon.es/animegrep
GNU General Public License v3.0
28 stars 4 forks source link

merging clips now work #4

Closed daniel-Jones closed 5 years ago

daniel-Jones commented 5 years ago

see https://gnupluslinux.com/out.mkv for example, searched for "French toast" in one episode. Had to fix -m as it was never run, apparently merging always worked... The entire scripts needs an overhaul, though. @martmists #3 would be cleaner and simpler I guess, but this works.

sr229 commented 5 years ago

CC @martmists check if you can merge your changes with his and there'll be no regressions.

Martmists-GH commented 5 years ago

Looks to me like there shouldn't be any merge conflicts since the diffs don't overlap.