diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
| commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
| tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /video/decode/vd_lavc.c | |
| parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
| parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
| download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz | |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'video/decode/vd_lavc.c')
| -rw-r--r-- | video/decode/vd_lavc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 17c719b710..97b3fa8b7d 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -140,13 +140,13 @@ const struct m_sub_options vd_lavc_conf = { .framedrop = AVDISCARD_NONREF, .dr = 1, .hwdec_api = HAVE_RPI ? "mmal" : "no", - .hwdec_codecs = "h264,vc1,wmv3,hevc,mpeg2video,vp9", + .hwdec_codecs = "h264,vc1,hevc,vp9", }, }; struct hwdec_info { char name[64]; - char method_name[16]; // non-unique name describing the hwdec method + char method_name[24]; // non-unique name describing the hwdec method const AVCodec *codec; // implemented by this codec enum AVHWDeviceType lavc_device; // if not NONE, get a hwdevice bool copying; // if true, outputs sw frames, or copy to sw ourselves |