diff options
author | wm4 <wm4@nowhere> | 2020-06-17 16:18:07 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-06-17 19:43:09 +0200 |
commit | 6ff20c71ab93139d150a26612e2ef90168f71dfb (patch) | |
tree | 938b318915b1ac0a578691f8cdc192b426ed7ed3 | |
parent | b9069c9dbfcf343013f720c2f3328d8afa5684d3 (diff) | |
download | mpv-6ff20c71ab93139d150a26612e2ef90168f71dfb.tar.bz2 mpv-6ff20c71ab93139d150a26612e2ef90168f71dfb.tar.xz |
video: alias IMGFMT_RGB30 to AV_PIX_FMT_X2RGB10
IMGFMT_RGB30 was added first; FFmpeg added AV_PIX_FMT_X2RGB10 later.
This is exactly the same, so treat them as such. For some reason,
libswscale still seems to output incompatible data - not sure what this
is about, but I'm not going to debug it.
-rw-r--r-- | video/fmt-conversion.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 8c9aa40bfa..5194221d50 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -53,6 +53,10 @@ static const struct { {IMGFMT_RGBA64, AV_PIX_FMT_RGBA64}, +#ifdef AV_PIX_FMT_X2RGB10 + {IMGFMT_RGB30, AV_PIX_FMT_X2RGB10}, +#endif + {IMGFMT_VDPAU, AV_PIX_FMT_VDPAU}, {IMGFMT_VIDEOTOOLBOX, AV_PIX_FMT_VIDEOTOOLBOX}, {IMGFMT_MEDIACODEC, AV_PIX_FMT_MEDIACODEC}, |