[FFmpeg-cvslog] avcodec/cuviddec: also reflect new pix_fmts in cuvid_handle_video_sequence

[Timo Rothenpieler]

ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Sat Jul 26 14:42:05 2025 +0200| [a56da996ce957c8716f073d79a300d7adefeb1e4] | committer: Timo Rothenpieler

avcodec/cuviddec: also reflect new pix_fmts in cuvid_handle_video_sequence

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a56da996ce957c8716f073d79a300d7adefeb1e4
---

 libavcodec/cuviddec.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index 9978642bf8..27e3d835ac 100644
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -191,10 +191,18 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form
         break;
     case 2: // 10-bit
         if (chroma_444) {
+#if FF_API_NVDEC_OLD_PIX_FMTS
             pix_fmts[1] = AV_PIX_FMT_YUV444P16;
+#else
+            pix_fmts[1] = AV_PIX_FMT_YUV444P10MSB;
+#endif
 #ifdef NVDEC_HAVE_422_SUPPORT
         } else if (format->chroma_format == cudaVideoChromaFormat_422) {
-            pix_fmts[1] = AV_PIX_FMT_P216LE;
+#if FF_API_NVDEC_OLD_PIX_FMTS
+            pix_fmts[1] = AV_PIX_FMT_P216;
+#else
+            pix_fmts[1] = AV_PIX_FMT_P210;
+#endif
 #endif
         } else {
             pix_fmts[1] = AV_PIX_FMT_P016;
@@ -203,13 +211,25 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form
         break;
     case 4: // 12-bit
         if (chroma_444) {
+#if FF_API_NVDEC_OLD_PIX_FMTS
             pix_fmts[1] = AV_PIX_FMT_YUV444P16;
+#else
+            pix_fmts[1] = AV_PIX_FMT_YUV444P12MSB;
+#endif
 #ifdef NVDEC_HAVE_422_SUPPORT
         } else if (format->chroma_format == cudaVideoChromaFormat_422) {
-            pix_fmts[1] = AV_PIX_FMT_P216LE;
+#if FF_API_NVDEC_OLD_PIX_FMTS
+            pix_fmts[1] = AV_PIX_FMT_P216;
+#else
+            pix_fmts[1] = AV_PIX_FMT_P212;
+#endif
 #endif
         } else {
+#if FF_API_NVDEC_OLD_PIX_FMTS
             pix_fmts[1] = AV_PIX_FMT_P016;
+#else
+            pix_fmts[1] = AV_PIX_FMT_P012;
+#endif
         }
         caps = &ctx->caps12;
         break;