Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.3.4.tar.gz/ChangeLog -> ffx264-3.3.5.tar.gz/ChangeLog Changed

ffx264-3.3.4.tar.gz/ffx264 -> ffx264-3.3.5.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.3.4
-# Date: 2017-01-25
+# Version: 3.3.5
+# Date: 2017-02-06
 #
 # ffx264 is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="3.3.4"
+version="3.3.5"
 
 CFG="$HOME/.ffx264"
 cfgversion="30"
@@ -1207,11 +1207,12 @@
 			brown " ~~~~~~~~~~~~~~~~~~~~~~"
 			echo " 0 -> fps (converts by duplicating/dropping of frames)"
 			echo " 1 -> setpts + atempo (converts by PTS + audio speedup/down)"
+			echo " 2 -> framestep (frame rate halving - for options 18-20)"
 			echo
 			printf "Specify the FPS Conversion Method [default is 0]: "
 			read fcm
 			case "$fcm" in
-				0|1|"") true ;;
+				0|1|2|"") true ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
@@ -1229,8 +1230,9 @@
 			echo " 5 --> 24 FPS to 29.970 FPS        16 -> 60 FPS to 50 FPS"
 			echo "                                   17 -> 60 FPS to 59.940 FPS"
 			echo " 6 --> 25 FPS to 23.976 FPS"
-			echo " 7 --> 25 FPS to 24 FPS"
-			echo " 8 --> 25 FPS to 29.970 FPS"
+			echo " 7 --> 25 FPS to 24 FPS            18 -> 50 FPS to 25 FPS"
+			echo " 8 --> 25 FPS to 29.970 FPS        19 -> 59.940 FPS to 29.970 FPS"
+			echo "                                   20 -> 60 FPS to 30 FPS" 
 			echo
 			printf "Specify the FPS Conversion option [press 'Enter' to skip]: "
 			read fpsopt
@@ -1361,6 +1363,15 @@
 				esac
 				ofps="-r 60000/1001"
 				;;
+				18)
+				ofps="-r 25/1"
+				;;
+				19)
+				ofps="-r 30000/1001"
+				;;
+				20)
+				ofps="-r 30/1"
+				;;
 				"")
 				true
 				;;
@@ -1369,6 +1380,24 @@
 				exit 1
 				;;
 			esac
+			case "$fpsopt" in
+				18|19|20)
+				if [ "$fcm" != "2" ]; then
+					error "-> Options 18-20 support only the 'framestep' filter!"
+					exit 1
+				fi
+				framestep="framestep=step=2,"
+				;;
+				"")
+				true
+				;;
+				*)
+				if [ "$fcm" = "2" ]; then
+					error "-> The 'framestep' filter is supported only by options 18-20!"
+					exit 1
+				fi
+				;;
+			esac
 		fi
 	fi
 fi
@@ -2503,7 +2532,7 @@
 
 test "$CHAPS" = "n" && CHPS="-map_chapters -1"
 
-vidfilters="$(echo "$deinterlace$detelecine$pixformat$colorspace$crop$deblock$denoise$scale$rotate$setpts$fps" | sed 's|,$||')"
+vidfilters="$(echo "$deinterlace$detelecine$pixformat$colorspace$crop$deblock$denoise$scale$rotate$setpts$fps$framestep" | sed 's|,$||')"
 
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"

Changes of Revision 44