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/lavc.h | |
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/lavc.h')
-rw-r--r-- | video/decode/lavc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/lavc.h b/video/decode/lavc.h index 9ef74668d8..44c5c27a0f 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -50,7 +50,7 @@ struct vd_lavc_hwdec { // get_format callback. int image_format; int (*probe)(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info, - const char *decoder); + const char *codec); int (*init)(struct lavc_ctx *ctx); int (*init_decoder)(struct lavc_ctx *ctx, int w, int h); void (*uninit)(struct lavc_ctx *ctx); @@ -80,7 +80,7 @@ struct hwdec_profile_entry { const struct hwdec_profile_entry *hwdec_find_profile( struct lavc_ctx *ctx, const struct hwdec_profile_entry *table); -bool hwdec_check_codec_support(const char *decoder, +bool hwdec_check_codec_support(const char *codec, const struct hwdec_profile_entry *table); int hwdec_get_max_refs(struct lavc_ctx *ctx); |