diff mbox

[FFmpeg-devel,9/9] avcodec/cuvid: update hw_frames_ctx reference after get_format call

Message ID 20170210123541.32375-10-nfxjfg@googlemail.com
State Superseded
Headers show

Commit Message

wm4 Feb. 10, 2017, 12:35 p.m. UTC 
From: Timo Rothenpieler <timo@rothenpieler.org>

---
 libavcodec/cuvid.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c
index 6091d81d3b..463c0dbf49 100644
--- a/libavcodec/cuvid.c
+++ b/libavcodec/cuvid.c
@@ -136,6 +136,19 @@  static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form
         return 0;
     }
 
+    // Update our hwframe ctx, as the get_format callback might have refreshed it!
+    if (avctx->hw_frames_ctx) {
+        av_buffer_unref(&ctx->hwframe);
+
+        ctx->hwframe = av_buffer_ref(avctx->hw_frames_ctx);
+        if (!ctx->hwframe) {
+            ctx->internal_error = AVERROR(ENOMEM);
+            return 0;
+        }
+
+        hwframe_ctx = (AVHWFramesContext*)ctx->hwframe->data;
+    }
+
     av_log(avctx, AV_LOG_VERBOSE, "Formats: Original: %s | HW: %s | SW: %s\n",
            av_get_pix_fmt_name(avctx->pix_fmt),
            av_get_pix_fmt_name(surface_fmt),