diff options
author | wm4 <wm4@nowhere> | 2013-11-22 18:04:59 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-22 18:06:34 +0100 |
commit | de22d2b1bafd2644b2ce6008f102427337796fd8 (patch) | |
tree | e0ceb06a7f0022e7f176c709dd69e86df5233e2b /video/decode | |
parent | 061927276751a3c7bc0b9c941e61d29b3ba29d7c (diff) | |
download | mpv-de22d2b1bafd2644b2ce6008f102427337796fd8.tar.bz2 mpv-de22d2b1bafd2644b2ce6008f102427337796fd8.tar.xz |
vf_vavpp: make it work with vo_opengl and software decoding
vo_opengl always loads the hwdec backend lazily, so hwdec_request_api()
has to be called to possibly load it. This makes vf_vavpp work with
software decoding. (Hardware decoding loads the backend before the
filter is initialized, so this case is different.)
Also, the VFCTRL_GET_HWDEC_INFO call doesn't need to be checked. If it
fails, the info will be left blank.
Diffstat (limited to 'video/decode')
-rw-r--r-- | video/decode/dec_video.h | 2 | ||||
-rw-r--r-- | video/decode/lavc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index 03b72907ef..959d50caaf 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -54,4 +54,6 @@ struct mp_hwdec_info { void *load_api_ctx; }; +void hwdec_request_api(struct mp_hwdec_info *info, const char *api_name); + #endif /* MPLAYER_DEC_VIDEO_H */ diff --git a/video/decode/lavc.h b/video/decode/lavc.h index af206bc82a..9e2533cbd5 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -86,8 +86,6 @@ bool hwdec_check_codec_support(const char *decoder, const struct hwdec_profile_entry *table); int hwdec_get_max_refs(struct lavc_ctx *ctx); -void hwdec_request_api(struct mp_hwdec_info *info, const char *api_name); - // lavc_dr1.c int mp_codec_get_buffer(AVCodecContext *s, AVFrame *frame); void mp_codec_release_buffer(AVCodecContext *s, AVFrame *frame); |