Merge pull request #188 from Aleksoid1978/master

Fix build without ENABLE_FILM_GRAIN.
fraunhoferhhi · Jun 25, 2024 · ad8f4bb · ad8f4bb
2 parents 752bdd0 + c7e2f8b
commit ad8f4bb
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/source/Lib/vvdec/vvdecimpl.cpp b/source/Lib/vvdec/vvdecimpl.cpp
@@ -983,6 +983,11 @@ int VVDecImpl::xAddPicture( Picture* pcPic )
   cFrame.ctsValid       = true;
 
   int ret;
+#if ENABLE_FILM_GRAIN
+  bool origStride = m_filmGrainCharacteristicsState != FgcNone;
+#else
+  bool origStride = false;
+#endif
 #if RPR_YUV_OUTPUT
   if( m_cDecLib->getUpscaledOutput() && ( uiWidth != orgWidth || uiHeight != orgHeight ) )
   {
@@ -991,10 +996,10 @@ int VVDecImpl::xAddPicture( Picture* pcPic )
   }
   else
   {
-    ret = xCreateFrame( cFrame, cPicBuf, uiWidth, uiHeight, bitDepths, bCreateStorage, m_filmGrainCharacteristicsState != FgcNone );
+    ret = xCreateFrame( cFrame, cPicBuf, uiWidth, uiHeight, bitDepths, bCreateStorage, origStride );
   }
 #else
-  ret = xCreateFrame( cFrame, cPicBuf, uiWidth, uiHeight, bitDepths, bCreateStorage, m_filmGrainCharacteristicsState != FgcNone );
+  ret = xCreateFrame( cFrame, cPicBuf, uiWidth, uiHeight, bitDepths, bCreateStorage, origStride );
 #endif
   if( ret != VVDEC_OK )
   {