Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

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

ffx264-3.3.5.tar.gz/ffx264 -> ffx264-3.3.6.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.5
-# Date: 2017-02-06
+# Version: 3.3.6
+# Date: 2017-02-22
 #
 # 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.5"
+version="3.3.6"
 
 CFG="$HOME/.ffx264"
 cfgversion="30"
@@ -76,8 +76,7 @@
 #
 SCALER=""
 
-# Support NTSC <-> PAL or
-# NTSC <-> NTSC FPS conversion?
+# Support FPS conversion?
 VID_FPS_CONVERT="y"
 
 # Video filters
@@ -1221,18 +1220,21 @@
 			echo
 			brown " FPS Conversion"
 			brown " ~~~~~~~~~~~~~~"
-			echo " 0 --> 23.976 FPS to 24 FPS        12 -> 50 FPS to 59.940 FPS"
-			echo " 1 --> 23.976 FPS to 25 FPS        13 -> 50 FPS to 60 FPS"
-			echo " 2 --> 23.976 FPS to 29.970 FPS"
-			echo "                                   14 -> 59.940 FPS to 50 FPS"
-			echo " 3 --> 24 FPS to 23.976 FPS        15 -> 59.940 FPS to 60 FPS"
+			echo " 0 --> 23.976 FPS to 24 FPS        12 -> 50 FPS to 59.940 FPS       23 -> 50 FPS to 29.970 FPS"
+			echo " 1 --> 23.976 FPS to 25 FPS        13 -> 50 FPS to 60 FPS   "
+			echo " 2 --> 23.976 FPS to 29.970 FPS                                     24 -> 59.940 FPS to 23.976 FPS "
+			echo "                                   14 -> 59.940 FPS to 50 FPS       25 -> 59.940 FPS to 24 FPS"
+			echo " 3 --> 24 FPS to 23.976 FPS        15 -> 59.940 FPS to 60 FPS       26 -> 59.940 FPS to 25 FPS"
 			echo " 4 --> 24 FPS to 25 FPS"
-			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            18 -> 50 FPS to 25 FPS"
+			echo " 5 --> 24 FPS to 29.970 FPS        16 -> 60 FPS to 50 FPS           27 -> 60 FPS to 23.976 FPS"
+			echo "                                   17 -> 60 FPS to 59.940 FPS       28 -> 60 FPS to 24 FPS"
+			echo " 6 --> 25 FPS to 23.976 FPS                                         29 -> 60 FPS to 25 FPS"
+			echo " 7 --> 25 FPS to 24 FPS            18 -> 50 FPS to 25 FPS           30 -> 60 FPS to 29.970 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 " 9 --> 29.970 FPS to 23.976 FPS"
+			echo " 10 -> 29.970 FPS to 24 FPS        21 -> 50 FPS to 23.976 FPS"
+			echo " 11 -> 29.970 FPS to 25 FPS        22 -> 50 FPS to 24 FPS"
 			echo
 			printf "Specify the FPS Conversion option [press 'Enter' to skip]: "
 			read fpsopt
@@ -1372,6 +1374,46 @@
 				20)
 				ofps="-r 30/1"
 				;;
+				21)
+				setpts="framestep=step=2,setpts=25000/23976*PTS,"; atempo="atempo=0.95904,"
+				ofps="-r 24000/1001"
+				;;
+				22)
+				setpts="framestep=step=2,setpts=25000/24000*PTS,"; atempo="atempo=0.96,"
+				ofps="-r 24/1"
+				;;
+				23)
+				setpts="framestep=step=2,setpts=25000/29970*PTS,"; atempo="atempo=1.1988,"
+				ofps="-r 30000/1001"
+				;;
+				24)
+				setpts="framestep=step=2,setpts=29970/23976*PTS,"; atempo="atempo=0.8,"
+				ofps="-r 24000/1001"
+				;;
+				25)
+				setpts="framestep=step=2,setpts=29970/24000*PTS,"; atempo="atempo=0.800800800801,"
+				ofps="-r 24/1"
+				;;
+				26)
+				setpts="framestep=step=2,setpts=29970/25000*PTS,"; atempo="atempo=0.83416750083416750083,"
+				ofps="-r 25/1"
+				;;
+				27)
+				setpts="framestep=step=2,setpts=30000/23976*PTS,"; atempo="atempo=0.7992,"
+				ofps="-r 24000/1001"
+				;;
+				28)
+				setpts="framestep=step=2,setpts=30000/24000*PTS,"; atempo="atempo=0.8,"
+				ofps="-r 24/1"
+				;;
+				29)
+				setpts="framestep=step=2,setpts=30000/25000*PTS,"; atempo="atempo=0.83333333333333333333,"
+				ofps="-r 25/1"
+				;;
+				30)
+				setpts="framestep=step=2,setpts=30000/29970*PTS,"; atempo="atempo=0.999,"
+				ofps="-r 30000/1001"
+				;;
 				"")
 				true
 				;;
@@ -1388,6 +1430,12 @@
 				fi
 				framestep="framestep=step=2,"
 				;;
+				2[1-9]|30)
+				if [ "$fcm" != "1" ]; then
+					error "-> Options 21-30 support only the 'setpts' filter!"
+					exit 1
+				fi
+				;;
 				"")
 				true
 				;;

Changes of Revision 45