Merge pull request #153 from Nicko98/master

Fix for issue #145
This commit is contained in:
KrumpetPirate 2021-02-21 18:23:29 -05:00 committed by GitHub
commit 70ae2cef12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -679,6 +679,17 @@ do
chapter_codec="copy" chapter_codec="copy"
fi fi
#Since there seems to be a bug in some older versions of ffmpeg, which makes, that -ss and -to
#have to be apllied to the output file, this makes, that -ss and -to get applied on the input for
#ffmpeg version 4+ and on the output for all older versions.
split_input=""
split_output=""
if [ "$(($(ffmpeg -version | head -1 | cut -d \ -f 3 | cut -d . -f 1) > 3))" = "1" ]; then
split_input="-ss ${chapter_start%?} -to ${chapter_end}"
else
split_output="-ss ${chapter_start%?} -to ${chapter_end}"
fi
# Big Long chapter debug # Big Long chapter debug
debug_vars "Chapter Variables:" cover_file chapter_start chapter_end chapternum chapterNameScheme chapter_title chapter_file debug_vars "Chapter Variables:" cover_file chapter_start chapter_end chapternum chapterNameScheme chapter_title chapter_file
if [ "$((${continueAt} > ${chapternum}))" = "0" ]; then if [ "$((${continueAt} > ${chapternum}))" = "0" ]; then
@ -689,10 +700,10 @@ do
fi fi
</dev/null ffmpeg -loglevel quiet \ </dev/null ffmpeg -loglevel quiet \
-nostats \ -nostats \
-ss "${chapter_start%?}" \ ${split_input} \
-to "${chapter_end}" \
-i "${output_file}" \ -i "${output_file}" \
-i "${cover_file}" \ -i "${cover_file}" \
${split_output} \
-map 0:0 \ -map 0:0 \
-map 1:0 \ -map 1:0 \
-acodec ${chapter_codec} \ -acodec ${chapter_codec} \