summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-08-24 11:35:17 +0200
committerwm4 <wm4@nowhere>2017-08-24 11:35:17 +0200
commitecef999d1958169f1def9ce0092f6fecd3409656 (patch)
tree0075992fdf3e247822c96d60e211cd294f8cad9e
parentb62150bd6ba55cda3bd74a2db6d64ea5acd84f8e (diff)
downloadmpv-ecef999d1958169f1def9ce0092f6fecd3409656.tar.bz2
mpv-ecef999d1958169f1def9ce0092f6fecd3409656.tar.xz
vd_lavc: work around some more idiotic FFmpeg nonsense
Like in commit bd356333c713, but for the other hwaccels as well. Fixes #4794.
-rw-r--r--video/decode/vd_lavc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 8a6a729778..e08246a296 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -200,6 +200,7 @@ static const struct vd_lavc_hwdec mp_vd_lavc_vaapi = {
.pixfmt_map = (const enum AVPixelFormat[][2]) {
{AV_PIX_FMT_YUV420P10, AV_PIX_FMT_P010},
{AV_PIX_FMT_YUV420P, AV_PIX_FMT_NV12},
+ {AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NV12},
{AV_PIX_FMT_NONE}
},
};
@@ -217,6 +218,7 @@ static const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy = {
.pixfmt_map = (const enum AVPixelFormat[][2]) {
{AV_PIX_FMT_YUV420P10, AV_PIX_FMT_P010},
{AV_PIX_FMT_YUV420P, AV_PIX_FMT_NV12},
+ {AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NV12},
{AV_PIX_FMT_NONE}
},
};
@@ -230,6 +232,7 @@ static const struct vd_lavc_hwdec mp_vd_lavc_vdpau = {
.set_hwframes = true,
.pixfmt_map = (const enum AVPixelFormat[][2]) {
{AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P},
+ {AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUV420P},
{AV_PIX_FMT_NONE}
},
};
@@ -245,6 +248,7 @@ static const struct vd_lavc_hwdec mp_vd_lavc_vdpau_copy = {
.create_dev = vdpau_create_standalone,
.pixfmt_map = (const enum AVPixelFormat[][2]) {
{AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P},
+ {AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUV420P},
{AV_PIX_FMT_NONE}
},
};