summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-31 18:25:29 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-31 18:25:29 +0000
commite9eb8b3ba253830049e2bdedecedc3e69612b8da (patch)
treefb698794e3ab711af6b15f49a0e36ab8c841d5a3
parentae5b2c52501d5009fe712334428138a9b758849b (diff)
downloadffmpeg-streaming-e9eb8b3ba253830049e2bdedecedc3e69612b8da.zip
ffmpeg-streaming-e9eb8b3ba253830049e2bdedecedc3e69612b8da.tar.gz
flacenc: Restore defaults and range for {min,max}_prediction_order
This was broken in 243df1351d2d928caa084a5704ed783f0b83f072. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r--libavcodec/flacenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index b4137ca..6fed138 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1482,8 +1482,8 @@ static const AVOption options[] = {
{ "mid_side", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FLAC_CHMODE_MID_SIDE }, INT_MIN, INT_MAX, FLAGS, "ch_mode" },
{ "exact_rice_parameters", "Calculate rice parameters exactly", offsetof(FlacEncodeContext, options.exact_rice_parameters), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "multi_dim_quant", "Multi-dimensional quantization", offsetof(FlacEncodeContext, options.multi_dim_quant), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
-{ "min_prediction_order", NULL, offsetof(FlacEncodeContext, options.min_prediction_order), AV_OPT_TYPE_INT, { .i64 = 0 }, MIN_LPC_ORDER, MAX_LPC_ORDER, FLAGS },
-{ "max_prediction_order", NULL, offsetof(FlacEncodeContext, options.max_prediction_order), AV_OPT_TYPE_INT, { .i64 = 0 }, MIN_LPC_ORDER, MAX_LPC_ORDER, FLAGS },
+{ "min_prediction_order", NULL, offsetof(FlacEncodeContext, options.min_prediction_order), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, MAX_LPC_ORDER, FLAGS },
+{ "max_prediction_order", NULL, offsetof(FlacEncodeContext, options.max_prediction_order), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, MAX_LPC_ORDER, FLAGS },
{ NULL },
};
OpenPOWER on IntegriCloud