vlc | branch: master | Ludovic Fauvet <[email protected]> | Fri Jan 2 14:37:52 2015 +0100| [e83d098a39ed55d6a2c500191178fe20ab2f2c8b] | committer: Ludovic Fauvet
avcodec: fix ffmpeg version check > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e83d098a39ed55d6a2c500191178fe20ab2f2c8b --- modules/codec/avcodec/va.h | 2 ++ modules/hw/vdpau/avcodec.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/codec/avcodec/va.h b/modules/codec/avcodec/va.h index ba26df2..64dca01 100644 --- 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 c7c9491..150146f 100644 --- 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
