Update qmin/qmax values for libx264 presets

Also allow qmin/qmax to go up to 69 (the current max value for libx264).  This
will have to increase when we add 9/10-bit support.

diff --git a/ffpresets/libx264-fast.ffpreset b/ffpresets/libx264-fast.ffpreset
index cac6534..0fc1f22 100644 (file)
--- a/ffpresets/libx264-fast.ffpreset
+++ b/ffpresets/libx264-fast.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=2

diff --git a/ffpresets/libx264-fast_firstpass.ffpreset b/ffpresets/libx264-fast_firstpass.ffpreset
index 65ec011..cdcbbbf 100644 (file)
--- a/ffpresets/libx264-fast_firstpass.ffpreset
+++ b/ffpresets/libx264-fast_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-faster.ffpreset b/ffpresets/libx264-faster.ffpreset
index a32eed3..3156cd8 100644 (file)
--- a/ffpresets/libx264-faster.ffpreset
+++ b/ffpresets/libx264-faster.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=2

diff --git a/ffpresets/libx264-faster_firstpass.ffpreset b/ffpresets/libx264-faster_firstpass.ffpreset
index c777eb4..9bcf18a 100644 (file)
--- a/ffpresets/libx264-faster_firstpass.ffpreset
+++ b/ffpresets/libx264-faster_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-lossless_fast.ffpreset b/ffpresets/libx264-lossless_fast.ffpreset
index ea08d3c..b7696b5 100644 (file)
--- a/ffpresets/libx264-lossless_fast.ffpreset
+++ b/ffpresets/libx264-lossless_fast.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 directpred=1
 flags2=+fastpskip

diff --git a/ffpresets/libx264-lossless_max.ffpreset b/ffpresets/libx264-lossless_max.ffpreset
index 8c049c9..75c387f 100644 (file)
--- a/ffpresets/libx264-lossless_max.ffpreset
+++ b/ffpresets/libx264-lossless_max.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 refs=16
 directpred=1

diff --git a/ffpresets/libx264-lossless_medium.ffpreset b/ffpresets/libx264-lossless_medium.ffpreset
index 558be6c..116e334 100644 (file)
--- a/ffpresets/libx264-lossless_medium.ffpreset
+++ b/ffpresets/libx264-lossless_medium.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 directpred=1
 flags2=+fastpskip

diff --git a/ffpresets/libx264-lossless_slow.ffpreset b/ffpresets/libx264-lossless_slow.ffpreset
index ff641cf..0d496f6 100644 (file)
--- a/ffpresets/libx264-lossless_slow.ffpreset
+++ b/ffpresets/libx264-lossless_slow.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 refs=2
 directpred=1

diff --git a/ffpresets/libx264-lossless_slower.ffpreset b/ffpresets/libx264-lossless_slower.ffpreset
index 854f74b..672e0cd 100644 (file)
--- a/ffpresets/libx264-lossless_slower.ffpreset
+++ b/ffpresets/libx264-lossless_slower.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 refs=4
 directpred=1

diff --git a/ffpresets/libx264-lossless_ultrafast.ffpreset b/ffpresets/libx264-lossless_ultrafast.ffpreset
index 1c429f2..a2eda65 100644 (file)
--- a/ffpresets/libx264-lossless_ultrafast.ffpreset
+++ b/ffpresets/libx264-lossless_ultrafast.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 directpred=1
 flags2=+fastpskip

diff --git a/ffpresets/libx264-medium.ffpreset b/ffpresets/libx264-medium.ffpreset
index 039f1d6..3c90ec5 100644 (file)
--- a/ffpresets/libx264-medium.ffpreset
+++ b/ffpresets/libx264-medium.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=3

diff --git a/ffpresets/libx264-medium_firstpass.ffpreset b/ffpresets/libx264-medium_firstpass.ffpreset
index e415989..2ad0a9c 100644 (file)
--- a/ffpresets/libx264-medium_firstpass.ffpreset
+++ b/ffpresets/libx264-medium_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-placebo.ffpreset b/ffpresets/libx264-placebo.ffpreset
index fae2222..9f4719f 100644 (file)
--- a/ffpresets/libx264-placebo.ffpreset
+++ b/ffpresets/libx264-placebo.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=16
 refs=16

diff --git a/ffpresets/libx264-placebo_firstpass.ffpreset b/ffpresets/libx264-placebo_firstpass.ffpreset
index fae2222..9f4719f 100644 (file)
--- a/ffpresets/libx264-placebo_firstpass.ffpreset
+++ b/ffpresets/libx264-placebo_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=16
 refs=16

diff --git a/ffpresets/libx264-slow.ffpreset b/ffpresets/libx264-slow.ffpreset
index 0f3f4d4..dabe0ae 100644 (file)
--- a/ffpresets/libx264-slow.ffpreset
+++ b/ffpresets/libx264-slow.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=5

diff --git a/ffpresets/libx264-slow_firstpass.ffpreset b/ffpresets/libx264-slow_firstpass.ffpreset
index 89e74e4..4af64db 100644 (file)
--- a/ffpresets/libx264-slow_firstpass.ffpreset
+++ b/ffpresets/libx264-slow_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-slower.ffpreset b/ffpresets/libx264-slower.ffpreset
index f3a412c..239ee68 100644 (file)
--- a/ffpresets/libx264-slower.ffpreset
+++ b/ffpresets/libx264-slower.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=8

diff --git a/ffpresets/libx264-slower_firstpass.ffpreset b/ffpresets/libx264-slower_firstpass.ffpreset
index aa1eb1e..4b5b420 100644 (file)
--- a/ffpresets/libx264-slower_firstpass.ffpreset
+++ b/ffpresets/libx264-slower_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-superfast.ffpreset b/ffpresets/libx264-superfast.ffpreset
index bcd4599..fb2ab8c 100644 (file)
--- a/ffpresets/libx264-superfast.ffpreset
+++ b/ffpresets/libx264-superfast.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-superfast_firstpass.ffpreset b/ffpresets/libx264-superfast_firstpass.ffpreset
index ef06b1d..55ff9a2 100644 (file)
--- a/ffpresets/libx264-superfast_firstpass.ffpreset
+++ b/ffpresets/libx264-superfast_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-ultrafast.ffpreset b/ffpresets/libx264-ultrafast.ffpreset
index b6d2080..28dc0eb 100644 (file)
--- a/ffpresets/libx264-ultrafast.ffpreset
+++ b/ffpresets/libx264-ultrafast.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=0
 i_qfactor=0.71
 b_strategy=0
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=0
 refs=1

diff --git a/ffpresets/libx264-ultrafast_firstpass.ffpreset b/ffpresets/libx264-ultrafast_firstpass.ffpreset
index b6d2080..28dc0eb 100644 (file)
--- a/ffpresets/libx264-ultrafast_firstpass.ffpreset
+++ b/ffpresets/libx264-ultrafast_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=0
 i_qfactor=0.71
 b_strategy=0
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=0
 refs=1

diff --git a/ffpresets/libx264-veryfast.ffpreset b/ffpresets/libx264-veryfast.ffpreset
index 16ca594..bfa3d8f 100644 (file)
--- a/ffpresets/libx264-veryfast.ffpreset
+++ b/ffpresets/libx264-veryfast.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-veryfast_firstpass.ffpreset b/ffpresets/libx264-veryfast_firstpass.ffpreset
index 39eaf3e..ac2332d 100644 (file)
--- a/ffpresets/libx264-veryfast_firstpass.ffpreset
+++ b/ffpresets/libx264-veryfast_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1

diff --git a/ffpresets/libx264-veryslow.ffpreset b/ffpresets/libx264-veryslow.ffpreset
index a060625..e07aeb8 100644 (file)
--- a/ffpresets/libx264-veryslow.ffpreset
+++ b/ffpresets/libx264-veryslow.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=8
 refs=16

diff --git a/ffpresets/libx264-veryslow_firstpass.ffpreset b/ffpresets/libx264-veryslow_firstpass.ffpreset
index 6e7079b..e17c04b 100644 (file)
--- a/ffpresets/libx264-veryslow_firstpass.ffpreset
+++ b/ffpresets/libx264-veryslow_firstpass.ffpreset
@@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=8
 refs=1

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 369ee5d..ff4cc2d 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -117,8 +117,8 @@ static const AVOption options[]={
 {"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"qcomp", "video quantizer scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, 0.5, -FLT_MAX, FLT_MAX, V|E},
 {"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, 0.5, 0, FLT_MAX, V|E},
-{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 63, V|E},
-{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 63, V|E},
+{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 69, V|E},
+{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 69, V|E},
 {"qdiff", "max difference between the quantizer scale (VBR)", OFFSET(max_qdiff), FF_OPT_TYPE_INT, 3, INT_MIN, INT_MAX, V|E},
 {"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, 0, FF_MAX_B_FRAMES, V|E},
 {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, 1.25, -FLT_MAX, FLT_MAX, V|E},