Корректировка кастомного кода ffmpeg.

Hackjjang · Feb 22, 2024 · ef23fb1 · ef23fb1
1 parent b7ad4b0
commit ef23fb1
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/src/ExtLib/ffmpeg/libavcodec/hevcdec.c b/src/ExtLib/ffmpeg/libavcodec/hevcdec.c
@@ -498,13 +498,6 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
 #endif
 #if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL
         *fmt++ = AV_PIX_FMT_VIDEOTOOLBOX;
-#endif
-        break;
-// ==> Start patch MPC
-    case AV_PIX_FMT_YUV422P12:
-#if CONFIG_HEVC_D3D11VA_HWACCEL
-        *fmt++ = AV_PIX_FMT_D3D11VA_VLD;
-        *fmt++ = AV_PIX_FMT_D3D11;
 #endif
 #if CONFIG_HEVC_VULKAN_HWACCEL
         *fmt++ = AV_PIX_FMT_VULKAN;
@@ -535,16 +528,20 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
 #endif
 #if CONFIG_HEVC_NVDEC_HWACCEL
         *fmt++ = AV_PIX_FMT_CUDA;
+#endif
+        break;
+    case AV_PIX_FMT_YUV422P12:
 // ==> Start patch MPC
-//#endif
-//        break;
-//    case AV_PIX_FMT_YUV422P12:
-//#if CONFIG_HEVC_VAAPI_HWACCEL
-//       *fmt++ = AV_PIX_FMT_VAAPI;
-//#endif
-//#if CONFIG_HEVC_VULKAN_HWACCEL
-//        *fmt++ = AV_PIX_FMT_VULKAN;
+#if CONFIG_HEVC_D3D11VA_HWACCEL
+        *fmt++ = AV_PIX_FMT_D3D11VA_VLD;
+        *fmt++ = AV_PIX_FMT_D3D11;
+#endif
 // ==> End patch MPC
+#if CONFIG_HEVC_VAAPI_HWACCEL
+       *fmt++ = AV_PIX_FMT_VAAPI;
+#endif
+#if CONFIG_HEVC_VULKAN_HWACCEL
+        *fmt++ = AV_PIX_FMT_VULKAN;
 #endif
         break;
     }