avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

[ffmpeg] / libavcodec / flacenc.c

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 935d55f32dc5b1b92650ad16ff91a5b4de32a57c..29bd9999b5b7324235e6988ae2946ac57ca7e8fb 100644 (file)
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -705,7 +705,7 @@ static uint64_t calc_rice_params(RiceContext *rc,
     bits[pmin] = UINT32_MAX;
     for (i = pmax; ; ) {
         bits[i] = calc_optimal_rice_params(&tmp_rc, i, sums, n, pred_order, kmax, exact);
-        if (bits[i] < bits[opt_porder]) {
+        if (bits[i] < bits[opt_porder] || pmax == pmin) {
             opt_porder = i;
             *rc = tmp_rc;
         }
@@ -969,7 +969,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
                 score = find_subframe_rice_params(s, sub, opt_order);
                 if (score < best_score) {
                     best_score = score;
-                    memcpy(coefs[opt_order-1], lpc_try, sizeof(coefs[opt_order-1]));
+                    memcpy(coefs[opt_order-1], lpc_try, sizeof(*coefs));
                     improved=1;
                 }
             }