diff --git a/Batch/vid2ani.cmd b/Batch/vid2ani.cmd index 26bb49e..84b915a 100755 --- a/Batch/vid2ani.cmd +++ b/Batch/vid2ani.cmd @@ -218,7 +218,6 @@ IF DEFINED colormax ( :: Executing command to generate palette ECHO %GREEN%Generating palette...%OFF% -echo ffmpeg -v %loglevel% %trim% -i %input% -vf "%filters%,%encode%%mcol%" -y "%palette%" ffmpeg -v %loglevel% %trim% -i %input% -vf "%filters%,%encode%%mcol%" -y "%palette%" :: Checking if the palette file is in the Working Directory, if not cleaning up @@ -271,7 +270,6 @@ IF "%filetype%" == "webp" ( :: Executing the encoding command ECHO %GREEN%Encoding animation...%OFF% -echo ffmpeg -v %loglevel% %trim% -i %input% -thread_queue_size 512 -i "%palette%" -lavfi "%filters% [x]; [x][1:v] %decode%%errordiff%%ditherenc%%bayer%" -f %filetype% %webp_lossy% -loop 0 -plays 0 -y "%output%" ffmpeg -v %loglevel% %trim% -i %input% -thread_queue_size 512 -i "%palette%" -lavfi "%filters% [x]; [x][1:v] %decode%%errordiff%%ditherenc%%bayer%" -f %filetype% %webp_lossy% -loop 0 -plays 0 -y "%output%" :: Checking if file was created and cleaning up if not diff --git a/Batch/vid2ani.sh b/Batch/vid2ani.sh index a6e0fa1..c96f685 100755 --- a/Batch/vid2ani.sh +++ b/Batch/vid2ani.sh @@ -181,7 +181,6 @@ fi # Executing command to generate palette echo ${GREEN}"Generating palette..."${OFF} -echo ffmpeg -v "${loglevel}" ${trim:-} -i "${input}" -vf "${filters},${encode}${mcol}" -y "${palette}" ffmpeg -v "${loglevel}" ${trim:-} -i "${input}" -vf "${filters},${encode}${mcol}" -y "${palette}" # Checking if the palette file is in the Working Directory, if not cleaning up @@ -246,7 +245,6 @@ fi # Executing the encoding command echo ${GREEN}"Encoding animation..."${OFF} -echo ffmpeg -v "${loglevel}" ${trim:-} -i "${input}" -thread_queue_size 512 -i "${palette}" -lavfi "${filters} [x]; [x][1:v] ${decode}${errordiff}${ditherenc}${bayer}" -f "${filetype}" ${webp_lossy:-} -loop 0 -plays 0 -y "${output}" ffmpeg -v "${loglevel}" ${trim:-} -i "${input}" -thread_queue_size 512 -i "${palette}" -lavfi "${filters} [x]; [x][1:v] ${decode}${errordiff}${ditherenc}${bayer}" -f "${filetype}" ${webp_lossy:-} -loop 0 -plays 0 -y "${output}" # Checking if output file was created diff --git a/Cmder/config/user-ConEmu.xml b/Cmder/config/user-ConEmu.xml index f0b3355..1fb4c41 100755 --- a/Cmder/config/user-ConEmu.xml +++ b/Cmder/config/user-ConEmu.xml @@ -1,7 +1,7 @@ - + @@ -950,7 +950,7 @@ - + diff --git a/Cmder/config/user_aliases.cmd b/Cmder/config/user_aliases.cmd index 4147f31..e7f10bd 100755 --- a/Cmder/config/user_aliases.cmd +++ b/Cmder/config/user_aliases.cmd @@ -16,7 +16,6 @@ far=d:\bin\FarManager\Far.exe $* ga=git add -A $* gc=git commit $* gs=git status $* -gg=global /1 /E .git $* gh=git hist $* gl=git log --oneline --all --graph --decorate --color $* home=cd /d "%USERPROFILE%" @@ -46,3 +45,4 @@ winscp=d:\bin\WinSCP\winscp.exe $* sudo=gsudo $* pb=sh d:\bin\cygwin\usr\local\bin\pb $* 'pb=sh d:\bin\cygwin\usr\local\bin\pb' $* +gg=global /V /1 /E .git $*