diff options
Diffstat (limited to 'video/fmt-conversion.c')
| -rw-r--r-- | video/fmt-conversion.c | 58 |
1 files changed, 26 insertions, 32 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 6a45713f7c..cf3aaa7452 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -29,52 +29,47 @@ static const struct { {IMGFMT_ARGB, PIX_FMT_ARGB}, {IMGFMT_BGRA, PIX_FMT_BGRA}, {IMGFMT_BGR24, PIX_FMT_BGR24}, - {IMGFMT_BGR16BE, PIX_FMT_RGB565BE}, - {IMGFMT_BGR16LE, PIX_FMT_RGB565LE}, - {IMGFMT_BGR15BE, PIX_FMT_RGB555BE}, - {IMGFMT_BGR15LE, PIX_FMT_RGB555LE}, - {IMGFMT_BGR12BE, PIX_FMT_RGB444BE}, - {IMGFMT_BGR12LE, PIX_FMT_RGB444LE}, + {IMGFMT_BGR16_BE, PIX_FMT_RGB565BE}, + {IMGFMT_BGR16_LE, PIX_FMT_RGB565LE}, + {IMGFMT_BGR15_BE, PIX_FMT_RGB555BE}, + {IMGFMT_BGR15_LE, PIX_FMT_RGB555LE}, + {IMGFMT_BGR12_BE, PIX_FMT_RGB444BE}, + {IMGFMT_BGR12_LE, PIX_FMT_RGB444LE}, {IMGFMT_BGR8, PIX_FMT_RGB8}, {IMGFMT_BGR4, PIX_FMT_RGB4}, - {IMGFMT_BGR1, PIX_FMT_MONOBLACK}, - {IMGFMT_RGB1, PIX_FMT_MONOBLACK}, - {IMGFMT_RG4B, PIX_FMT_BGR4_BYTE}, - {IMGFMT_BG4B, PIX_FMT_RGB4_BYTE}, - {IMGFMT_RGB48LE, PIX_FMT_RGB48LE}, - {IMGFMT_RGB48BE, PIX_FMT_RGB48BE}, + {IMGFMT_MONO, PIX_FMT_MONOBLACK}, + {IMGFMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE}, + {IMGFMT_BGR4_BYTE, PIX_FMT_RGB4_BYTE}, + {IMGFMT_RGB48_LE, PIX_FMT_RGB48LE}, + {IMGFMT_RGB48_BE, PIX_FMT_RGB48BE}, {IMGFMT_ABGR, PIX_FMT_ABGR}, {IMGFMT_RGBA, PIX_FMT_RGBA}, {IMGFMT_RGB24, PIX_FMT_RGB24}, - {IMGFMT_RGB16BE, PIX_FMT_BGR565BE}, - {IMGFMT_RGB16LE, PIX_FMT_BGR565LE}, - {IMGFMT_RGB15BE, PIX_FMT_BGR555BE}, - {IMGFMT_RGB15LE, PIX_FMT_BGR555LE}, - {IMGFMT_RGB12BE, PIX_FMT_BGR444BE}, - {IMGFMT_RGB12LE, PIX_FMT_BGR444LE}, + {IMGFMT_RGB16_BE, PIX_FMT_BGR565BE}, + {IMGFMT_RGB16_LE, PIX_FMT_BGR565LE}, + {IMGFMT_RGB15_BE, PIX_FMT_BGR555BE}, + {IMGFMT_RGB15_LE, PIX_FMT_BGR555LE}, + {IMGFMT_RGB12_BE, PIX_FMT_BGR444BE}, + {IMGFMT_RGB12_LE, PIX_FMT_BGR444LE}, {IMGFMT_RGB8, PIX_FMT_BGR8}, {IMGFMT_RGB4, PIX_FMT_BGR4}, {IMGFMT_PAL8, PIX_FMT_PAL8}, {IMGFMT_GBRP, PIX_FMT_GBRP}, - {IMGFMT_YUY2, PIX_FMT_YUYV422}, + {IMGFMT_YUYV, PIX_FMT_YUYV422}, {IMGFMT_UYVY, PIX_FMT_UYVY422}, {IMGFMT_NV12, PIX_FMT_NV12}, {IMGFMT_NV21, PIX_FMT_NV21}, - {IMGFMT_Y800, PIX_FMT_GRAY8}, {IMGFMT_Y8, PIX_FMT_GRAY8}, - {IMGFMT_Y16LE, PIX_FMT_GRAY16LE}, - {IMGFMT_Y16BE, PIX_FMT_GRAY16BE}, - {IMGFMT_YVU9, PIX_FMT_YUV410P}, - {IMGFMT_IF09, PIX_FMT_YUV410P}, - {IMGFMT_YV12, PIX_FMT_YUV420P}, - {IMGFMT_I420, PIX_FMT_YUV420P}, - {IMGFMT_IYUV, PIX_FMT_YUV420P}, + {IMGFMT_Y16_LE, PIX_FMT_GRAY16LE}, + {IMGFMT_Y16_BE, PIX_FMT_GRAY16BE}, + {IMGFMT_410P, PIX_FMT_YUV410P}, + {IMGFMT_420P, PIX_FMT_YUV420P}, {IMGFMT_411P, PIX_FMT_YUV411P}, {IMGFMT_422P, PIX_FMT_YUV422P}, {IMGFMT_444P, PIX_FMT_YUV444P}, {IMGFMT_440P, PIX_FMT_YUV440P}, - {IMGFMT_420A, PIX_FMT_YUVA420P}, + {IMGFMT_420AP, PIX_FMT_YUVA420P}, {IMGFMT_420P16_LE, PIX_FMT_YUV420P16LE}, {IMGFMT_420P16_BE, PIX_FMT_YUV420P16BE}, @@ -95,10 +90,9 @@ static const struct { {IMGFMT_444P16_LE, PIX_FMT_YUV444P16LE}, {IMGFMT_444P16_BE, PIX_FMT_YUV444P16BE}, - // YUVJ are YUV formats that use the full Y range and not just - // 16 - 235 (see colorspaces.txt). - // Currently they are all treated the same way. - {IMGFMT_YV12, PIX_FMT_YUVJ420P}, + // YUVJ are YUV formats that use the full Y range. Decoder color range + // information is used instead. Deprecated in ffmpeg. + {IMGFMT_420P, PIX_FMT_YUVJ420P}, {IMGFMT_422P, PIX_FMT_YUVJ422P}, {IMGFMT_444P, PIX_FMT_YUVJ444P}, {IMGFMT_440P, PIX_FMT_YUVJ440P}, |