cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_1

   1 --- ffmpeg-4.4/libavcodec/aaccoder.c.orig       2021-05-08 11:52:41.824074401 +0300
   2 +++ ffmpeg-4.4/libavcodec/aaccoder.c    2021-05-08 11:55:06.868074410 +0300
   3 @@ -800,7 +800,7 @@
   4
   5                  for (sid_sf_boost = 0; sid_sf_boost < 4; sid_sf_boost++) {
   6                      float dist1 = 0.0f, dist2 = 0.0f;
   7 -                    int B0 = 0, B1 = 0;
   8 +                    int B0_ = 0, B1 = 0;
   9                      int minidx;
  10                      int mididx, sididx;
  11                      int midcb, sidcb;
  12 @@ -862,12 +862,12 @@
  13                                                      sididx,
  14                                                      sidcb,
  15                                                      mslambda / (minthr * bmax), INFINITY, &b4, NULL, 0);
  16 -                        B0 += b1+b2;
  17 +                        B0_ += b1+b2;
  18                          B1 += b3+b4;
  19                          dist1 -= b1+b2;
  20                          dist2 -= b3+b4;
  21                      }
  22 -                    cpe->ms_mask[w*16+g] = dist2 <= dist1 && B1 < B0;
  23 +                    cpe->ms_mask[w*16+g] = dist2 <= dist1 && B1 < B0_;
  24                      if (cpe->ms_mask[w*16+g]) {
  25                          if (sce0->band_type[w*16+g] != NOISE_BT && sce1->band_type[w*16+g] != NOISE_BT) {
  26                              sce0->sf_idx[w*16+g] = mididx;
  27 @@ -879,7 +879,7 @@
  28                              cpe->ms_mask[w*16+g] = 0;
  29                          }
  30                          break;
  31 -                    } else if (B1 > B0) {
  32 +                    } else if (B1 > B0_) {
  33                          /* More boost won't fix this */
  34                          break;
  35                      }