Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump to 5.1.1

Browse Source
This commit is contained in:
Polochon-street
2022-08-03 08:50:45 +02:00
parent 4275a8b0a2
commit b6b2311fcf
6 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/format/pixel.rs
View File

@ -25,9 +25,9 @@ pub enum Pixel {
YUVJ420P,
YUVJ422P,
YUVJ444P,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
XVMC_MPEG2_MC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
XVMC_MPEG2_IDCT,
UYVY422,
UYYVYY411,
@ -222,7 +222,7 @@ pub enum Pixel {
VIDEOTOOLBOX,
// --- defaults
#[cfg(not(feature = "ff_api_xvmc"))]
#[cfg(feature = "ffmpeg_4_0")]
XVMC,
RGB32,
@ -394,7 +394,7 @@ impl Pixel {
pub const Y400A: Pixel = Pixel::YA8;
pub const GRAY8A: Pixel = Pixel::YA8;
pub const GBR24P: Pixel = Pixel::GBRP;
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
pub const XVMC: Pixel = Pixel::XVMC_MPEG2_IDCT;
pub fn descriptor(self) -> Option<Descriptor> {
@ -449,11 +449,11 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_YUVJ420P => Pixel::YUVJ420P,
AV_PIX_FMT_YUVJ422P => Pixel::YUVJ422P,
AV_PIX_FMT_YUVJ444P => Pixel::YUVJ444P,
#[cfg(not(feature = "ff_api_xvmc"))]
#[cfg(feature = "ffmpeg_4_0")]
AV_PIX_FMT_XVMC => Pixel::XVMC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
AV_PIX_FMT_XVMC_MPEG2_MC => Pixel::XVMC_MPEG2_MC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
AV_PIX_FMT_XVMC_MPEG2_IDCT => Pixel::XVMC_MPEG2_IDCT,
AV_PIX_FMT_UYVY422 => Pixel::UYVY422,
AV_PIX_FMT_UYYVYY411 => Pixel::UYYVYY411,
@ -767,9 +767,9 @@ impl From<Pixel> for AVPixelFormat {
Pixel::YUVJ420P => AV_PIX_FMT_YUVJ420P,
Pixel::YUVJ422P => AV_PIX_FMT_YUVJ422P,
Pixel::YUVJ444P => AV_PIX_FMT_YUVJ444P,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
Pixel::XVMC_MPEG2_MC => AV_PIX_FMT_XVMC_MPEG2_MC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
Pixel::XVMC_MPEG2_IDCT => AV_PIX_FMT_XVMC_MPEG2_IDCT,
Pixel::UYVY422 => AV_PIX_FMT_UYVY422,
Pixel::UYYVYY411 => AV_PIX_FMT_UYYVYY411,
@ -964,7 +964,7 @@ impl From<Pixel> for AVPixelFormat {
Pixel::VIDEOTOOLBOX => AV_PIX_FMT_VIDEOTOOLBOX,
// --- defaults
#[cfg(not(feature = "ff_api_xvmc"))]
#[cfg(feature = "ffmpeg_4_0")]
Pixel::XVMC => AV_PIX_FMT_XVMC,
Pixel::RGB32 => AV_PIX_FMT_RGB32,