Module: libav
Branch: master
Commit: 5781bfae0cf4271278a8bea176d615cb5c222335
Author: Michael Niedermayer <mich...@niedermayer.cc>
Committer: Vittorio Giovara <vittorio.giov...@gmail.com>
Date: Wed Feb 3 15:57:39 2016 +0100
flacenc: Load default prediction_order parameters if none is selected
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
---
libavcodec/flacenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 81c3bb6..d05a0c6 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -305,8 +305,10 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
FF_LPC_TYPE_LEVINSON,
FF_LPC_TYPE_LEVINSON, FF_LPC_TYPE_LEVINSON,
FF_LPC_TYPE_LEVINSON})[level];
- s->options.min_prediction_order = ((int[]){ 2, 0, 0, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1})[level];
- s->options.max_prediction_order = ((int[]){ 3, 4, 4, 6, 8, 8, 8,
8, 12, 12, 12, 32, 32})[level];
+ if (s->options.min_prediction_order < 0)
+ s->options.min_prediction_order = ((int[]){ 2, 0, 0, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1})[level];
+ if (s->options.max_prediction_order < 0)
+ s->options.max_prediction_order = ((int[]){ 3, 4, 4, 6, 8, 8,
8, 8, 12, 12, 12, 32, 32})[level];
if (s->options.prediction_order_method < 0)
s->options.prediction_order_method = ((int[]){ ORDER_METHOD_EST,
ORDER_METHOD_EST, ORDER_METHOD_EST,
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
