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 11
View file
ffx264.changes
Changed
@@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Mon Nov 07 16:25:00 UTC 2016 - neutrino8@opensuse.org + +- Update to version 2.9.5 + * Cosmetics in the code for deinterlacing + * Instead of skipping FPS conversion if the FPS can't be detected, + ask the user to provide it + * Use single brackets instead of double ones in the nosound + setup code + * Added license snippet at the top of the script + * Added support for outputting to additional container formats + * Do some checking on supported audio codecs for the supported + containers + * Check specified container and warn and exit if it's not supported + * Support setting the FLAC compression level + * Added h264_mp4toannexb flag in case we're outputting to the AVI + container + * Break out of the if conditionals in the audio code and replace + them with two case statements + * Update to the README file + +------------------------------------------------------------------- Sun Nov 06 09:52:00 UTC 2016 - neutrino8@opensuse.org - Update to version 3.1.0
View file
ffx264.spec
Changed
@@ -17,7 +17,7 @@ Name: ffx264 -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: A small shell script for encoding to H.264 with ffmpeg License: GPL-2.0+
View file
ffx264-3.1.0.tar.gz/ChangeLog -> ffx264-3.1.1.tar.gz/ChangeLog
Changed
@@ -1,3 +1,21 @@ +2016-11-07 - ffx264 3.1.1 + * Cosmetics in the code for deinterlacing + * Instead of skipping FPS conversion if the FPS can't be detected, + ask the user to provide it + * Use single brackets instead of double ones in the nosound + setup code + * Added license snippet at the top of the script + * Added support for outputting to additional container formats + * Do some checking on supported audio codecs for the supported + containers + * Check specified container and warn and exit if it's not supported + * Support setting the FLAC compression level + * Added h264_mp4toannexb flag in case we're outputting to the AVI + container + * Break out of the if conditionals in the audio code and replace + them with two case statements + * Update to the README file + 2016-11-06 - ffx264 3.1.0 * Bugfix: resampling wasn't working for fdk-aac due to missing value in the case statement
View file
ffx264-3.1.0.tar.gz/README -> ffx264-3.1.1.tar.gz/README
Changed
@@ -27,6 +27,7 @@ - it supports cover art for the MKV container. - it supports the x264 presets and tune profiles. - it supports custom written preset files. +- it can output to more than one container. Parameters:
View file
ffx264-3.1.0.tar.gz/ffx264 -> ffx264-3.1.1.tar.gz/ffx264
Changed
@@ -2,15 +2,28 @@ # # Small script to encode to H.264/AVC video using FFmpeg and libx264. # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org> -# Version: 3.1.0 -# Date: 2016-11-06 -# License: GNU GPLv2+ +# Version: 3.1.1 +# Date: 2016-11-07 +# +# ffx264 is free software ; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation ; either version 2 of the License, or +# (at your option) any later version. +# +# ffx264 is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY ; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program ; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA green() { echo -e "\e[1;32m$1\e[0;39;49m"; } 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.0" +version="3.1.1" CFG="$HOME/.ffx264" cfgversion="24" @@ -356,11 +369,68 @@ read confmt test -z "$confmt" && CON="mkv" || CON="$confmt" fi + CON="$(echo "$CON" | tr '[:upper:]' '[:lower:]')" + case "$CON" in mp4|m4v|mov) movflags="-movflags +faststart" ;; + avi) annexb="-bsf:v h264_mp4toannexb" ;; + mkv) true ;; + *) + error "-> H.264 video not supported by chosen container!" + error "-> Supported containers are: mkv, mp4, mov, m4v and avi" + error "-> Check your config file, if needed, in '$CFG'" + exit 1 + ;; esac + printf "Output to Additional Container Formats? [y/N]: " + read acf + if [ "$acf" = "y" -o "$acf" = "Y" ]; then + printf "Specify the Container Formats [example: mp4,mov,avi - press 'Enter' to skip]: " + read econ + test ! -z "$econ" && extracon="$(echo "$econ" | sed 's|,| |g' | tr '[:upper:]' '[:lower:]')" + if [ ! -z "$extracon" ]; then + for i in $extracon; do + if [ "$i" = "$CON" ]; then + error "-> Additional container matches the main output container!" + exit 1 + fi + case "$i" in + mkv|mp4|mov|m4v|avi) true ;; + *) + error "-> H.264 video not supported by the $i container!" + error "-> Supported containers are: mkv, mp4, mov, m4v and avi" + exit 1 + ;; + esac + echo + case "$i" in + mkv) + green "-> Note: additional container $i supports all the audio codecs" + ;; + mp4) + green "-> Note: additional container $i supports the following audio codecs:" + green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|copy|nosound" + ;; + mov) + green "-> Note: additional container $i supports the following audio codecs:" + green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|flac|copy|nosound" + ;; + m4v) + green "-> Note: additional container $i supports the following audio codecs:" + green "-> ac3|aac|fdk-aac|copy|nosound" + ;; + avi) + green "-> Note: additional container $i supports the following audio codecs:" + green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|pcm|flac|copy|nosound" + ;; + esac + done + echo + fi + fi + OUTPUT="$OUTPUT.$CON" test -e "$OUTPUT" && mv -f "$OUTPUT" "$OUTPUT.old" @@ -529,8 +599,8 @@ esac green "-> Detected $fparity Parity" if [ "$fp" = "progressive" ]; then - error "-> Your file appears to be progressive but" - error " this may be a misdetection!" + error "-> The video stream appears to be progressive" + error " but this may be a misdetection!" elif [ "$fp" = "???" ]; then error "-> Could not detect the Field Parity!" fi @@ -577,16 +647,15 @@ video_fps_func if [ ! -z "$GETFPS" ]; then FPS1="$(echo "$GETFPS" | awk -F/ '{print $1}')" - FPS2="$(echo "$GETFPS"| awk -F/ '{print $2}')" + FPS2="$(echo "$GETFPS" | awk -F/ '{print $2}')" OFPS="$(($FPS1*2))/$FPS2" green "-> Detected: $FPS1/$FPS2 FPS" green "-> Setting output FPS to: $OFPS" - echo ofps="-r $OFPS" else error "-> Could not detect the FPS value!" - echo fi + echo video_deinterlace_func bob bob="1" ;; @@ -752,7 +821,7 @@ sleep 1 video_fps_func if [ ! -z "$GETFPS" ]; then - green "-> Detected: $GETFPS FPS" + green "-> Detected $GETFPS FPS" else error "-> Could not detect the FPS value!" fi @@ -762,141 +831,147 @@ echo error "-> Detected FPS is not supported yet!" error "-> Supported FPS are: 24/1, 25/1, 24000/1001 and 30000/1001" - error "-> Skipping FPS conversion!" - skipfps="1" + echo + printf "Specify the FPS value of the Input File [no default!]: " + read infps + case "$infps" in + 24/1|25/1|24000/1001|30000/1001) true ;; + ""|*) + error "-> No value or unsupported value given!" + exit 1 + ;; + esac ;; esac echo - if [ -z "$skipfps" ]; then - brown " FPS Conversion Filters" - brown " ~~~~~~~~~~~~~~~~~~~~~~" - echo " 0 -> fps (converts by duplicating/dropping of frames)" - echo " 1 -> setpts + atempo (converts by PTS + audio speedup/down)" - echo - printf "Specify the FPS conversion method [default is 0]: " - read fcm + brown " FPS Conversion Filters" + brown " ~~~~~~~~~~~~~~~~~~~~~~" + echo " 0 -> fps (converts by duplicating/dropping of frames)" + echo " 1 -> setpts + atempo (converts by PTS + audio speedup/down)" + echo + printf "Specify the FPS conversion method [default is 0]: " + read fcm + case "$fcm" in + 0|1|"") true ;; + *) + error "-> Invalid option!" + exit 1 + ;; + esac + echo + brown " NTSC <-> PAL and NTSC <-> NTSC FPS Conversion" + brown " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + echo " 0 --> 23.976 FPS (24000/1001) to 24 FPS" + echo " 1 --> 23.976 FPS (24000/1001) to 25 FPS" + echo " 2 --> 23.976 FPS (24000/1001) to 29.970 FPS" + echo + echo " 3 --> 24 FPS to 23.976 FPS (24000/1001)" + echo " 4 --> 24 FPS to 25 FPS" + echo " 5 --> 24 FPS to 29.970 FPS (30000/1001)" + echo + echo " 6 --> 25 FPS to 23.976 FPS (24000/1001)" + echo " 7 --> 25 FPS to 24 FPS" + echo " 8 --> 25 FPS to 29.970 FPS (30000/1001)" + echo + echo " 9 --> 29.970 FPS (30000/1001) to 23.976 FPS (24000/1001)" + echo " 10 -> 29.970 FPS (30000/1001) to 24 FPS" + echo " 11 -> 29.970 FPS (30000/1001) to 25 FPS"
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
.