Projects
Multimedia
ffx264
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 18
View file
ffx264.changes
Changed
@@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Mon Nov 14 09:18:00 UTC 2016 - neutrino8@opensuse.org + +- Update to version 3.1.7 + * Set default amount of subtitles to 1 instead of exiting when no + value is given + * Allow the user to choose the amount of audio tracks he wants at + run time instead of requiring it to be set in the config file. + This removes config file var MAX_AUD_TRACKS and bumps up version + to 27 + * Renamed array variables audmapval and submapval to audindex and + subindex since we're not mapping but specifying the audio/sub + index id with these vars + * Fixed a possible case where audio params weren't cleared in + case the nosound option was chosen + +------------------------------------------------------------------- Sun Nov 13 11:36:00 UTC 2016 - neutrino8@opensuse.org - Update to version 3.1.6
View file
ffx264.spec
Changed
@@ -17,7 +17,7 @@ Name: ffx264 -Version: 3.1.6 +Version: 3.1.7 Release: 0 Summary: A small shell script for encoding to H.264 with ffmpeg License: GPL-2.0+
View file
ffx264-3.1.6.tar.gz/ChangeLog -> ffx264-3.1.7.tar.gz/ChangeLog
Changed
@@ -1,3 +1,17 @@ +2016-11-14 - ffx264 3.1.7 + * Set default amount of subtitles to 1 instead of exiting when no + value is given + * Allow the user to choose the amount of audio tracks he wants at + run time instead of requiring it to be set in the config file. + This removes config file var MAX_AUD_TRACKS and bumps up version + to 27 + * Renamed array variables audmapval and submapval to audindex and + subindex since we're not mapping but specifying the audio/sub + index id with these vars + * Fixed a possible case where audio params weren't cleared in + case the nosound option was chosen + * A few other small tweaks + 2016-11-13 - ffx264 3.1.6 * Added support for batch encoding mode, to be activated with the new -b option. It's used to encode directories with video files
View file
ffx264-3.1.6.tar.gz/ffx264 -> ffx264-3.1.7.tar.gz/ffx264
Changed
@@ -2,8 +2,8 @@ # # Small script to encode to H.264/AVC video using FFmpeg and libx264. # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org> -# Version: 3.1.6 -# Date: 2016-11-13 +# Version: 3.1.7 +# Date: 2016-11-14 # # ffx264 is free software ; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,10 +23,10 @@ brown() { echo -e "\e[0;33m$1\e[0;39;49m"; } error() { echo -e "\e[1;31m$1\e[0;39;49m"; } -version="3.1.6" +version="3.1.7" CFG="$HOME/.ffx264" -cfgversion="26" +cfgversion="27" genconfig_func() { cat<<EOF>>"$CFG" @@ -90,12 +90,6 @@ AUD_VOLUME="y" AUD_RESAMPLE="y" -# Max amount of audio tracks to support -# Any non-zero value will do. Set it -# to "auto" to ask for as many as -# detected audio tracks -MAX_AUD_TRACKS="2" - # Enable subtitles support? # Note: not all containers support # all types of subs! @@ -254,31 +248,11 @@ esac done -if [ ! -z "$PRSTFILE" ]; then - if [ ! -z "$vpreset" -o ! -z "$vtune" ]; then - if [ ! -z "$(grep '^X264PARAMS' "$PRSTFILE")" ]; then - echo - error "-> x264 presets/tune profiles are mutually exclusive with custom presets!" - echo - error "-> If you want to use a custom configuration file, don't add or comment" - error " out the X264PARAMS variable in it. Then you can use the built-in" - error " presets/tuning with that file." - echo - exit 1 - fi - fi -else +if [ ! -z "$vtune" ]; then if [ -z "$vpreset" ]; then - if [ -f "$CFG" -a -z "$(grep '^X264PARAMS' "$CFG")" ]; then - echo - error "-> The X264PARAMS variable is commented out" - error " or missing from '$CFG'" - echo - error "-> Regenerating config file!" - rm -f "$CFG" - genconfig_func - echo - fi + error "-> Tune profiles require a preset to be used!" + error "-> Use: $(basename $0) -h" + exit 1 fi fi @@ -315,7 +289,37 @@ source "$CFG" fi -test ! -z "$PRSTFILE" && source "$PRSTFILE" +if [ ! -z "$PRSTFILE" ]; then + if [ ! -z "$vpreset" ]; then + if [ ! -z "$(grep '^X264PARAMS' "$PRSTFILE")" ]; then + error "-> x264 presets/tune profiles are mutually exclusive with custom presets!" + error "-> If you want to use a custom configuration file, don't add or comment" + error " out the X264PARAMS variable in it. Then you can use the built-in" + error " presets/tuning with that file." + echo + exit 1 + fi + else + if [ -z "$(grep '^X264PARAMS' "$PRSTFILE")" ]; then + error "-> The X264PARAMS variable is commented out or missing in your file!" + error "-> Please at least add to the file: X264PARAMS=\"ref=4\" (for example)" + echo + exit 1 + fi + fi + source "$PRSTFILE" +else + if [ -z "$vpreset" ]; then + if [ -f "$CFG" -a -z "$(grep '^X264PARAMS' "$CFG")" ]; then + error "-> The X264PARAMS variable is commented out" + error " or missing in '$CFG'" + error "-> Regenerating config file!" + echo + rm -f "$CFG" + genconfig_func + fi + fi +fi if [ ! -z "$FFMPEG" ]; then if [ ! -x "$FFMPEG" ]; then @@ -1072,36 +1076,40 @@ video_subtitles_func() { case "$1" in infile) - printf "How many Subtitles to Copy?: " + printf "How many Subtitles to Copy? [0-inf - default is 1]: " read subcp case "$subcp" in + 0) SUBCP="0" ;; [1-9]*) SUBCP="$subcp" ;; - ""|*) - error "-> Invalid or no value given!" + "") SUBCP="1" ;; + *) + error "-> Invalid value!" exit 1 ;; esac - for i in $(eval echo "{1..$SUBCP}"); do - submapval[i]="$(($i-1))" - printf "Sub $i: Specify a Subtitle to Copy [example: 0:2]: " - read subnr[i] - if [ ! -z "${subnr[i]}" ]; then - printf "Sub $i: Specify the 3-letter Language Code for Metadata [press 'Enter' to skip]: " - read slang[i] - if [ ! -z "${slang[i]}" ]; then - sublang[i]="-metadata:s:s:${submapval[i]} language=${slang[i]}" + if [ "$SUBCP" != "0" ]; then + for i in $(eval echo "{1..$SUBCP}"); do + subindex[i]="$(($i-1))" + printf "Sub $i: Specify a Subtitle to Copy [example: 0:2]: " + read subnr[i] + if [ ! -z "${subnr[i]}" ]; then + printf "Sub $i: Specify the 3-letter Language Code for Metadata [press 'Enter' to skip]: " + read slang[i] + if [ ! -z "${slang[i]}" ]; then + sublang[i]="-metadata:s:s:${subindex[i]} language=${slang[i]}" + fi + subcopy[i]="-map ${subnr[i]} -c:s:${subindex[i]} copy ${sublang[i]}" + # Workaround for an ffmpeg disposition issue + # where in some cases it sets subsequent tracks + # as default. + test "$i" = "1" && sdis="default" || sdis="none" + subdis[i]="-disposition:s:${subindex[i]} $sdis" + else + error "-> No value given!" + exit 1 fi - subcopy[i]="-map ${subnr[i]} -c:s:${submapval[i]} copy ${sublang[i]}" - # Workaround for an ffmpeg disposition issue - # where in some cases it sets subsequent tracks - # as default. - test "$i" = "1" && sdis="default" || sdis="none" - subdis[i]="-disposition:s:${submapval[i]} $sdis" - else - error "-> No value given!" - exit 1 - fi - done + done + fi test "$subopt" = "2" && echo ;; ext) @@ -1128,38 +1136,42 @@ esac done fi - printf "How many External Subtitles to Add?: " + printf "How many External Subtitles to Add? [0-inf - default is 1]: " read subext case "$subext" in + 0) SUBEXT="0" ;; [1-9]*) SUBEXT="$subext" ;; - ""|*) - error "-> Invalid or no value given!" + "") SUBEXT="1" ;; + *) + error "-> Invalid value!" exit 1 ;; esac - for i in $(eval echo "{1..$SUBEXT}"); do - test ! -z "${submapval[*]}" && submap[i]="$((${submapval[-1]}+$i))" || submap[i]="$(($i-1))" - printf "Sub $i: Specify the Subtitle File: " - read -e sub[i] - if [ ! -f "${sub[i]}" ]; then - error "-> No such file!"
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.