encounter/rust-ffmpeg
0
0
Fork 0
mirror of https://github.com/encounter/rust-ffmpeg.git synced 2026-07-10 21:18:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

chore(util): feature-gate XVMC pixel formats, removed in 5.1

Browse Source
This commit is contained in:
tilpner
2023-05-24 17:22:59 +02:00
committed by Till Höppner
parent bdb9f7684b
commit 1d32aff2f3
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/codec/id.rs
+3 -3
View File
@@ -16,7 +16,7 @@ pub enum Id {
// video codecs
MPEG1VIDEO,
MPEG2VIDEO,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
MPEG2VIDEO_XVMC,
H261,
H263,
@@ -529,7 +529,7 @@ impl From<AVCodecID> for Id {
// video codecs
AV_CODEC_ID_MPEG1VIDEO => Id::MPEG1VIDEO,
AV_CODEC_ID_MPEG2VIDEO => Id::MPEG2VIDEO,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
AV_CODEC_ID_MPEG2VIDEO_XVMC => Id::MPEG2VIDEO_XVMC,
AV_CODEC_ID_H261 => Id::H261,
AV_CODEC_ID_H263 => Id::H263,
@@ -1034,7 +1034,7 @@ impl Into<AVCodecID> for Id {
// video codecs
Id::MPEG1VIDEO => AV_CODEC_ID_MPEG1VIDEO,
Id::MPEG2VIDEO => AV_CODEC_ID_MPEG2VIDEO,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
Id::MPEG2VIDEO_XVMC => AV_CODEC_ID_MPEG2VIDEO_XVMC,
Id::H261 => AV_CODEC_ID_H261,
Id::H263 => AV_CODEC_ID_H263,
src/util/format/pixel.rs
+7 -6
View File
@@ -28,9 +28,10 @@ pub enum Pixel {
YUVJ420P,
YUVJ422P,
YUVJ444P,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
XVMC_MPEG2_MC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
XVMC_MPEG2_IDCT,
UYVY422,
UYYVYY411,
@@ -386,9 +387,9 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_YUVJ420P => Pixel::YUVJ420P,
AV_PIX_FMT_YUVJ422P => Pixel::YUVJ422P,
AV_PIX_FMT_YUVJ444P => Pixel::YUVJ444P,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
AV_PIX_FMT_XVMC_MPEG2_MC => Pixel::XVMC_MPEG2_MC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
AV_PIX_FMT_XVMC_MPEG2_IDCT => Pixel::XVMC_MPEG2_IDCT,
AV_PIX_FMT_UYVY422 => Pixel::UYVY422,
AV_PIX_FMT_UYYVYY411 => Pixel::UYYVYY411,
@@ -644,9 +645,9 @@ impl Into<AVPixelFormat> for Pixel {
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(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
Pixel::XVMC_MPEG2_MC => AV_PIX_FMT_XVMC_MPEG2_MC,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(not(feature = "ffmpeg_5_1"), feature = "ff_api_xvmc"))]
Pixel::XVMC_MPEG2_IDCT => AV_PIX_FMT_XVMC_MPEG2_IDCT,
Pixel::UYVY422 => AV_PIX_FMT_UYVY422,
Pixel::UYYVYY411 => AV_PIX_FMT_UYYVYY411,
src/util/frame/mod.rs
+1 -1
View File
@@ -123,7 +123,7 @@ impl Frame {
#[inline]
pub fn timestamp(&self) -> Option<i64> {
unsafe {
match av_frame_get_best_effort_timestamp(self.as_ptr()) {
match (*self.as_ptr()).best_effort_timestamp {
AV_NOPTS_VALUE => None,
t => Some(t as i64),
}