From a7eee9142fb6e87a514b5c8a446eed5a9cab2ce9 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <i@zhimingwang.org>
Date: Wed, 19 Sep 2018 20:44:35 +0000
Subject: [PATCH] Revert 8199541 and guard with not(ffmpeg4)

---
 src/codec/capabilities.rs |  2 ++
 src/codec/debug.rs        |  8 ++++++++
 src/codec/id.rs           |  4 ++++
 src/format/format/flag.rs |  2 ++
 src/util/format/pixel.rs  | 15 +++++++++++++++
 5 files changed, 31 insertions(+)

diff --git a/src/codec/capabilities.rs b/src/codec/capabilities.rs
index 82366ae..0271eff 100644
--- a/src/codec/capabilities.rs
+++ b/src/codec/capabilities.rs
@@ -8,6 +8,8 @@ bitflags! {
         const TRUNCATED           = AV_CODEC_CAP_TRUNCATED;
         const DELAY               = AV_CODEC_CAP_DELAY;
         const SMALL_LAST_FRAME    = AV_CODEC_CAP_SMALL_LAST_FRAME;
+        #[cfg(not(feature = "ffmpeg4"))]
+        const HWACCEL_VDPAU       = AV_CODEC_CAP_HWACCEL_VDPAU;
         const SUBFRAMES           = AV_CODEC_CAP_SUBFRAMES;
         const EXPERIMENTAL        = AV_CODEC_CAP_EXPERIMENTAL;
         const CHANNEL_CONF        = AV_CODEC_CAP_CHANNEL_CONF;
diff --git a/src/codec/debug.rs b/src/codec/debug.rs
index 2da57f2..33ed7f4 100644
--- a/src/codec/debug.rs
+++ b/src/codec/debug.rs
@@ -8,12 +8,20 @@ bitflags! {
         const BITSTREAM   = FF_DEBUG_BITSTREAM;
         const MB_TYPE     = FF_DEBUG_MB_TYPE;
         const QP          = FF_DEBUG_QP;
+        #[cfg(not(feature = "ffmpeg4"))]
+        const MV          = FF_DEBUG_MV;
         const DCT_COEFF   = FF_DEBUG_DCT_COEFF;
         const SKIP        = FF_DEBUG_SKIP;
         const STARTCODE   = FF_DEBUG_STARTCODE;
+        #[cfg(not(feature = "ffmpeg4"))]
+        const PTS         = FF_DEBUG_PTS;
         const ER          = FF_DEBUG_ER;
         const MMCO        = FF_DEBUG_MMCO;
         const BUGS        = FF_DEBUG_BUGS;
+        #[cfg(not(feature = "ffmpeg4"))]
+        const VIS_QP      = FF_DEBUG_VIS_QP;
+        #[cfg(not(feature = "ffmpeg4"))]
+        const VIS_MB_TYPE = FF_DEBUG_VIS_MB_TYPE;
         const BUFFERS     = FF_DEBUG_BUFFERS;
         const THREADS     = FF_DEBUG_THREADS;
         const NOMC        = FF_DEBUG_NOMC;
diff --git a/src/codec/id.rs b/src/codec/id.rs
index 99abf3d..976b484 100644
--- a/src/codec/id.rs
+++ b/src/codec/id.rs
@@ -298,6 +298,8 @@ pub enum Id {
     ADPCM_G722,
     ADPCM_IMA_APC,
     ADPCM_VIMA,
+    #[cfg(not(feature = "ffmpeg4"))]
+    VIMA,
 
     ADPCM_AFC,
     ADPCM_IMA_OKI,
@@ -1277,6 +1279,8 @@ impl Into<AVCodecID> for Id {
             Id::ADPCM_G722 => AV_CODEC_ID_ADPCM_G722,
             Id::ADPCM_IMA_APC => AV_CODEC_ID_ADPCM_IMA_APC,
             Id::ADPCM_VIMA => AV_CODEC_ID_ADPCM_VIMA,
+            #[cfg(not(feature = "ffmpeg4"))]
+            Id::VIMA => AV_CODEC_ID_VIMA,
 
             Id::ADPCM_AFC => AV_CODEC_ID_ADPCM_AFC,
             Id::ADPCM_IMA_OKI => AV_CODEC_ID_ADPCM_IMA_OKI,
diff --git a/src/format/format/flag.rs b/src/format/format/flag.rs
index c69544f..2a599ad 100644
--- a/src/format/format/flag.rs
+++ b/src/format/format/flag.rs
@@ -6,6 +6,8 @@ bitflags! {
         const NO_FILE       = AVFMT_NOFILE;
         const NEED_NUMBER   = AVFMT_NEEDNUMBER;
         const SHOW_IDS      = AVFMT_SHOW_IDS;
+        #[cfg(not(feature = "ffmpeg4"))]
+        const RAW_PICTURE   = AVFMT_RAWPICTURE;
         const GLOBAL_HEADER = AVFMT_GLOBALHEADER;
         const NO_TIMESTAMPS = AVFMT_NOTIMESTAMPS;
         const GENERIC_INDEX = AVFMT_GENERIC_INDEX;
diff --git a/src/util/format/pixel.rs b/src/util/format/pixel.rs
index 593d37a..2c4d750 100644
--- a/src/util/format/pixel.rs
+++ b/src/util/format/pixel.rs
@@ -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,