diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
| commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
| tree | 89f2d90c5586560911e67c872b530c77f151168d /video/decode/dec_video.h | |
| parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
| parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
| download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/decode/dec_video.h')
| -rw-r--r-- | video/decode/dec_video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index f4646a97d0..1030973e1c 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -32,7 +32,7 @@ struct dec_video { struct mpv_global *global; struct MPOpts *opts; const struct vd_functions *vd_driver; - struct mp_hwdec_info *hwdec_info; // video output hwdec handles + struct mp_hwdec_devices *hwdec_devs; // video output hwdec handles struct sh_stream *header; struct mp_codec_params *codec; |