avcodec: fix ffmpeg version check

diff --git a/modules/codec/avcodec/va.h b/modules/codec/avcodec/va.h
index ba26df26746ad8901aa9547d182b1e9e5703ecc3..64dca01ebca583e06b6061b1addf70e15d088b3d 100644 (file)
--- a/modules/codec/avcodec/va.h
+++ b/modules/codec/avcodec/va.h
@@ -21,6 +21,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "avcommon_compat.h"
+
 #ifndef VLC_AVCODEC_VA_H
 #define VLC_AVCODEC_VA_H 1
 

diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index c7c949112ee0a77065120682f0ba7813d4de737f..150146fe4baef76011fa8dda83c55b06c50dd293 100644 (file)
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -61,7 +61,7 @@ struct vlc_va_sys_t
     vlc_vdp_video_field_t **pool;
 };
 
-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 10, 0))
+#if !LIBAVCODEC_VERSION_CHECK(56, 10, 0, 19, 100)
 static int av_vdpau_get_surface_parameters(AVCodecContext *avctx,
                                            VdpChromaType *type,
                                            uint32_t *width, uint32_t *height)
@@ -75,7 +75,7 @@ static int av_vdpau_get_surface_parameters(AVCodecContext *avctx,
     return 0;
 }
 #endif
-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 9, 0))
+#if !LIBAVCODEC_VERSION_CHECK(56, 9, 0, 18, 100)
 # define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (0)
 #endif