1. Steve Borho
  2. x265

Commits

Steve Borho  committed 2e17cb1 Merge

Merge with stable

  • Participants
  • Parent commits 282c2c6, 2e7d156
  • Branches default

Comments (0)

Files changed (2)

File .hgtags

View file
 cea97c4d79456842e00ade6be6fd5ec34610e5f8 1.0
 ae9609aeebdc3271114168ece003679e9b1dca1b 1.1
 d6257335c5370ee54317a0426a12c1f0724b18b9 1.2
+c1e4fc0162c14fdb84f5c3bd404fb28cfe10a17f 1.3

File source/encoder/encoder.cpp

View file
     {
         x265_log(p, X265_LOG_INFO, "Warning: picture-based SAO used with frame parallelism\n");
     }
+    if (p->bCULossless)
+    {
+        x265_log(p, X265_LOG_WARNING, "CU-Lossless is disabled in this release of x265\n");
+        p->bCULossless = 0;
+    }
 
     if (p->keyframeMax < 0)
     {