diff options
| author | wm4 <wm4@nowhere> | 2016-04-07 17:48:00 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-04-07 17:48:00 +0200 |
| commit | f009d16f362694b6f49571b76f8b0331966824b5 (patch) | |
| tree | 92851b786b11c32c0345cc1a803d58cc535a6219 /video/decode/dxva2.c | |
| parent | 32a92071b4cc58967d51a5e3ce1c3bed219d9111 (diff) | |
| download | mpv-f009d16f362694b6f49571b76f8b0331966824b5.tar.bz2 mpv-f009d16f362694b6f49571b76f8b0331966824b5.tar.xz | |
vd_lavc: fix codec vs. decoder confusion
Some functions which expected a codec name (i.e. the name of the video
format itself) were passed a decoder name. Most "native" libavcodec
decoders have the same name as the codec, so this was never an issue.
This should mean that e.g. using "--vd=lavc:h264_mmal --hwdec=mmal"
should now actually enable native surface mode (instead of doing copy-
back).
Diffstat (limited to 'video/decode/dxva2.c')
| -rw-r--r-- | video/decode/dxva2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/dxva2.c b/video/decode/dxva2.c index 79416d52b7..50eee69d2a 100644 --- a/video/decode/dxva2.c +++ b/video/decode/dxva2.c @@ -485,7 +485,7 @@ fail: } static int dxva2_probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info, - const char *decoder) + const char *codec) { hwdec_request_api(info, "dxva2"); // dxva2-copy can do without external context; dxva2 requires it. @@ -494,7 +494,7 @@ static int dxva2_probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info, info->hwctx->type == HWDEC_DXVA2_COPY) return HWDEC_ERR_NO_CTX; } - return d3d_probe_codec(decoder); + return d3d_probe_codec(codec); } const struct vd_lavc_hwdec mp_vd_lavc_dxva2 = { |