From 449cdfc0ffc365b121136f5b93907a8f219fedb6 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 25 May 2015 21:17:48 +0200
Subject: vd_lavc: report actually used hwdec API

Instead of the requested one, which can be just "auto", and which is
rather useless.
---
 video/decode/lavc.h    | 1 -
 video/decode/vd_lavc.c | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/video/decode/lavc.h b/video/decode/lavc.h
index eaddd4abc2..b1fc39a191 100644
--- a/video/decode/lavc.h
+++ b/video/decode/lavc.h
@@ -15,7 +15,6 @@ typedef struct lavc_ctx {
     AVCodecContext *avctx;
     AVFrame *pic;
     struct vd_lavc_hwdec *hwdec;
-    int selected_hwdec;
     enum AVPixelFormat pix_fmt;
     int best_csp;
     enum AVDiscard skip_frame;
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index ca9ab9e5eb..b52898acb2 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -273,8 +273,6 @@ static int init(struct dec_video *vd, const char *decoder)
     ctx->log = vd->log;
     ctx->opts = vd->opts;
 
-    ctx->selected_hwdec = vd->opts->hwdec_api;
-
     if (bstr_endswith0(bstr0(decoder), "_vdpau")) {
         MP_WARN(vd, "VDPAU decoder '%s' was requested. "
                 "This way of enabling hardware\ndecoding is not supported "
@@ -698,7 +696,7 @@ static int control(struct dec_video *vd, int cmd, void *arg)
         *(int *)arg = delay;
         return CONTROL_TRUE;
     case VDCTRL_GET_HWDEC: {
-        int hwdec = ctx->selected_hwdec;
+        int hwdec = ctx->hwdec ? ctx->hwdec->type : 0;
         if (!ctx->software_fallback_decoder)
             hwdec = 0;
         *(int *)arg = hwdec;
-- 
cgit v1.2.3