diff --git a/source/Lib/EncoderLib/EncModeCtrl.h b/source/Lib/EncoderLib/EncModeCtrl.h index 72851b5ec2a98e9df67aa7ccfb5f2d7b2b55ce7b..6478f405b8b7f3cf5dd8457391454b8e8a51532d 100644 --- a/source/Lib/EncoderLib/EncModeCtrl.h +++ b/source/Lib/EncoderLib/EncModeCtrl.h @@ -719,6 +719,7 @@ void forceQTonlyMode() } } +#if !JVET_AC0139_UNIFIED_MERGE const char* printType(EncTestModeType type) { char *ret; @@ -762,6 +763,7 @@ void printMode() printf("]\n"); } #endif +#endif protected: void xExtractFeatures ( const EncTestMode encTestmode, CodingStructure& cs );