From f009d16f362694b6f49571b76f8b0331966824b5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 7 Apr 2016 17:48:00 +0200 Subject: 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). --- video/decode/rpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/decode/rpi.c') diff --git a/video/decode/rpi.c b/video/decode/rpi.c index b72dc34faa..f2ed6d2549 100644 --- a/video/decode/rpi.c +++ b/video/decode/rpi.c @@ -50,9 +50,9 @@ static int init(struct lavc_ctx *ctx) } static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info, - const char *decoder) + const char *codec) { - return map_codec(decoder) ? 0 : HWDEC_ERR_NO_CODEC; + return map_codec(codec) ? 0 : HWDEC_ERR_NO_CODEC; } static const char *get_codec(struct lavc_ctx *ctx, const char *codec) -- cgit v1.2.3