summaryrefslogtreecommitdiffstats
path: root/video/decode/d3d.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-04-07 17:48:00 +0200
committerwm4 <wm4@nowhere>2016-04-07 17:48:00 +0200
commitf009d16f362694b6f49571b76f8b0331966824b5 (patch)
tree92851b786b11c32c0345cc1a803d58cc535a6219 /video/decode/d3d.c
parent32a92071b4cc58967d51a5e3ce1c3bed219d9111 (diff)
downloadmpv-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/d3d.c')
-rw-r--r--video/decode/d3d.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/d3d.c b/video/decode/d3d.c
index 14d94384be..4737ebf1bc 100644
--- a/video/decode/d3d.c
+++ b/video/decode/d3d.c
@@ -97,9 +97,9 @@ static const struct d3dva_mode d3dva_modes[] = {
#undef MODE
#undef MODE2
-int d3d_probe_codec(const char *decoder)
+int d3d_probe_codec(const char *codec)
{
- enum AVCodecID codec = mp_codec_to_av_codec_id(decoder);
+ enum AVCodecID codec = mp_codec_to_av_codec_id(codec);
for (int i = 0; i < MP_ARRAY_SIZE(d3dva_modes); i++) {
const struct d3dva_mode *mode = &d3dva_modes[i];
if (mode->codec == codec)