From 0de2f41af09dacfc33c7928c013729feb623936a Mon Sep 17 00:00:00 2001 From: meh Date: Mon, 11 May 2015 22:02:52 +0200 Subject: [PATCH] avutil/pixfmt: fix some constants --- sys/src/avutil/pixfmt.rs | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/sys/src/avutil/pixfmt.rs b/sys/src/avutil/pixfmt.rs index 2c87621..dcf8f1d 100644 --- a/sys/src/avutil/pixfmt.rs +++ b/sys/src/avutil/pixfmt.rs @@ -22,8 +22,8 @@ pub enum AVPixelFormat { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, - AV_PIX_FMT_XVMC_MPEG2_MC, - AV_PIX_FMT_XVMC_MPEG2_IDCT, + AV_PIX_FMT_XVMC_MPEG2_MC, // XXX: #if FF_API_XVMC + AV_PIX_FMT_XVMC_MPEG2_IDCT, // XXX: #if FF_API_XVMC AV_PIX_FMT_UYVY422, AV_PIX_FMT_UYYVYY411, AV_PIX_FMT_BGR8, @@ -45,11 +45,11 @@ pub enum AVPixelFormat { AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVA420P, - AV_PIX_FMT_VDPAU_H264, - AV_PIX_FMT_VDPAU_MPEG1, - AV_PIX_FMT_VDPAU_MPEG2, - AV_PIX_FMT_VDPAU_WMV3, - AV_PIX_FMT_VDPAU_VC1, + AV_PIX_FMT_VDPAU_H264, // XXX: #if FF_API_VDPAU + AV_PIX_FMT_VDPAU_MPEG1, // XXX: #if FF_API_VDPAU + AV_PIX_FMT_VDPAU_MPEG2, // XXX: #if FF_API_VDPAU + AV_PIX_FMT_VDPAU_WMV3, // XXX: #if FF_API_VDPAU + AV_PIX_FMT_VDPAU_VC1, // XXX: #if FF_API_VDPAU AV_PIX_FMT_RGB48BE, AV_PIX_FMT_RGB48LE, @@ -73,7 +73,7 @@ pub enum AVPixelFormat { AV_PIX_FMT_YUV422P16BE, AV_PIX_FMT_YUV444P16LE, AV_PIX_FMT_YUV444P16BE, - AV_PIX_FMT_VDPAU_MPEG4, + AV_PIX_FMT_VDPAU_MPEG4, // XXX: #if FF_API_VDPAU AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_RGB444LE, @@ -154,11 +154,6 @@ pub enum AVPixelFormat { AV_PIX_FMT_GBRAP16LE_LIBAV, AV_PIX_FMT_QSV, - AV_PIX_FMT_RGBA64BE = 0x123, - AV_PIX_FMT_RGBA64LE, - AV_PIX_FMT_BGRA64BE, - AV_PIX_FMT_BGRA64LE, - AV_PIX_FMT_0RGB = 0x123 + 4, AV_PIX_FMT_RGB0, AV_PIX_FMT_0BGR, @@ -225,12 +220,10 @@ pub mod default { pub const AV_PIX_FMT_RGB565: AVPixelFormat = AV_PIX_FMT_RGB565LE; pub const AV_PIX_FMT_RGB555: AVPixelFormat = AV_PIX_FMT_RGB555LE; pub const AV_PIX_FMT_RGB444: AVPixelFormat = AV_PIX_FMT_RGB444LE; - pub const AV_PIX_FMT_RGBA64: AVPixelFormat = AV_PIX_FMT_RGBA64LE; pub const AV_PIX_FMT_BGR48: AVPixelFormat = AV_PIX_FMT_BGR48LE; pub const AV_PIX_FMT_BGR565: AVPixelFormat = AV_PIX_FMT_BGR565LE; pub const AV_PIX_FMT_BGR555: AVPixelFormat = AV_PIX_FMT_BGR555LE; pub const AV_PIX_FMT_BGR444: AVPixelFormat = AV_PIX_FMT_BGR444LE; - pub const AV_PIX_FMT_BGRA64: AVPixelFormat = AV_PIX_FMT_BGRA64LE; pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE; pub const AV_PIX_FMT_YUV422P9: AVPixelFormat = AV_PIX_FMT_YUV422P9LE; @@ -292,12 +285,10 @@ pub mod default { pub const AV_PIX_FMT_RGB565: AVPixelFormat = AV_PIX_FMT_RGB565BE; pub const AV_PIX_FMT_RGB555: AVPixelFormat = AV_PIX_FMT_RGB555BE; pub const AV_PIX_FMT_RGB444: AVPixelFormat = AV_PIX_FMT_RGB444BE; - pub const AV_PIX_FMT_RGBA64: AVPixelFormat = AV_PIX_FMT_RGBA64BE; pub const AV_PIX_FMT_BGR48: AVPixelFormat = AV_PIX_FMT_BGR48BE; pub const AV_PIX_FMT_BGR565: AVPixelFormat = AV_PIX_FMT_BGR565BE; pub const AV_PIX_FMT_BGR555: AVPixelFormat = AV_PIX_FMT_BGR555BE; pub const AV_PIX_FMT_BGR444: AVPixelFormat = AV_PIX_FMT_BGR444BE; - pub const AV_PIX_FMT_BGRA64: AVPixelFormat = AV_PIX_FMT_BGRA64BE; pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9BE; pub const AV_PIX_FMT_YUV422P9: AVPixelFormat = AV_PIX_FMT_YUV422P9BE; @@ -380,8 +371,6 @@ pub const PIX_FMT_YUV420P16: AVPixelFormat = default::AV_PIX_FMT_YUV420P16; pub const PIX_FMT_YUV422P16: AVPixelFormat = default::AV_PIX_FMT_YUV422P16; pub const PIX_FMT_YUV444P16: AVPixelFormat = default::AV_PIX_FMT_YUV444P16; -pub const PIX_FMT_RGBA64: AVPixelFormat = default::AV_PIX_FMT_RGBA64; -pub const PIX_FMT_BGRA64: AVPixelFormat = default::AV_PIX_FMT_BGRA64; pub const PIX_FMT_GBRP9: AVPixelFormat = default::AV_PIX_FMT_GBRP9; pub const PIX_FMT_GBRP10: AVPixelFormat = default::AV_PIX_FMT_GBRP10; pub const PIX_FMT_GBRP12: AVPixelFormat = default::AV_PIX_FMT_GBRP12;