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

Revert 8199541 and guard with not(ffmpeg4)

Browse Source
This commit is contained in:
Zhiming Wang
2018-09-19 20:44:35 +00:00
parent 0e05c0bb29
commit a7eee9142f
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,8 @@ pub enum Pixel {
YUV444P10LE,
YUV422P9BE,
YUV422P9LE,
#[cfg(not(feature = "ffmpeg4"))]
VDA_VLD,
GBRP,
GBRP9BE,
@ -156,6 +158,9 @@ pub enum Pixel {
YVYU422,
#[cfg(not(feature = "ffmpeg4"))]
VDA,
YA16BE,
YA16LE,
@ -458,6 +463,8 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_YUV444P10LE => Pixel::YUV444P10LE,
AV_PIX_FMT_YUV422P9BE => Pixel::YUV422P9BE,
AV_PIX_FMT_YUV422P9LE => Pixel::YUV422P9LE,
#[cfg(not(feature = "ffmpeg4"))]
AV_PIX_FMT_VDA_VLD => Pixel::VDA_VLD,
AV_PIX_FMT_GBRP => Pixel::GBRP,
AV_PIX_FMT_GBRP9BE => Pixel::GBRP9BE,
@ -501,6 +508,9 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_YVYU422 => Pixel::YVYU422,
#[cfg(not(feature = "ffmpeg4"))]
AV_PIX_FMT_VDA => Pixel::VDA,
AV_PIX_FMT_YA16BE => Pixel::YA16BE,
AV_PIX_FMT_YA16LE => Pixel::YA16LE,
@ -700,6 +710,8 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::YUV444P10LE => AV_PIX_FMT_YUV444P10LE,
Pixel::YUV422P9BE => AV_PIX_FMT_YUV422P9BE,
Pixel::YUV422P9LE => AV_PIX_FMT_YUV422P9LE,
#[cfg(not(feature = "ffmpeg4"))]
Pixel::VDA_VLD => AV_PIX_FMT_VDA_VLD,
Pixel::GBRP => AV_PIX_FMT_GBRP,
Pixel::GBRP9BE => AV_PIX_FMT_GBRP9BE,
@ -743,6 +755,9 @@ impl Into<AVPixelFormat> for Pixel {
Pixel::YVYU422 => AV_PIX_FMT_YVYU422,
#[cfg(not(feature = "ffmpeg4"))]
Pixel::VDA => AV_PIX_FMT_VDA,
Pixel::YA16BE => AV_PIX_FMT_YA16BE,
Pixel::YA16LE => AV_PIX_FMT_YA16LE,