avcodec/flacenc: Fix prediction_order parameter

Fixes regression Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago · 3c8e95ab5d
parent e9eb8b3ba2
commit 3c8e95ab5d
1 changed files with 4 additions and 2 deletions
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@ -315,8 +315,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,