[FFmpeg-cvslog] avcodec/flacenc: Fix prediction_order parameter

Michael Niedermayer git at videolan.org
Sun Jan 31 20:14:58 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jan 31 20:04:17 2016 +0100| [3c8e95ab5da5a1e5ada0379020911d99efe48534] | committer: Michael Niedermayer

avcodec/flacenc: Fix prediction_order parameter

Fixes regression

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c8e95ab5da5a1e5ada0379020911d99efe48534
---

 libavcodec/flacenc.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 6fed138..a91ed19 100644
--- 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,



More information about the ffmpeg-cvslog mailing list