vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Apr 9 13:47:24 2017 +0200| [3546f6b0c0248345d22caa7e4ae090477474e5a7] | committer: Jean-Baptiste Kempf
avcodec: fix compilation with recent libavcodec versions > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3546f6b0c0248345d22caa7e4ae090477474e5a7 --- modules/codec/avcodec/avcommon_compat.h | 18 ++++++++++++++++++ modules/codec/avcodec/video.c | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h index ffe7fbb239..3db56c78b0 100644 --- a/modules/codec/avcodec/avcommon_compat.h +++ b/modules/codec/avcodec/avcommon_compat.h @@ -36,6 +36,24 @@ ( (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) +#ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT +# define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT +#endif +#ifndef AV_CODEC_FLAG_GRAY +# define AV_CODEC_FLAG_GRAY CODEC_FLAG_GRAY +#endif +#ifndef AV_CODEC_FLAG_DR1 +# define AV_CODEC_FLAG_DR1 CODEC_FLAG_DR1 +#endif +#ifndef AV_CODEC_FLAG_DELAY +# define AV_CODEC_FLAG_DELAY CODEC_FLAG_DELAY +#endif +#ifndef AV_CODEC_FLAG2_FAST +# define AV_CODEC_FLAG2_FAST CODEC_FLAG2_FAST +#endif +#ifndef FF_INPUT_BUFFER_PADDING_SIZE +# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE +#endif #endif /* HAVE_LIBAVCODEC_AVCODEC_H */ diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index dcc5a8fe54..4041df0f34 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -437,10 +437,10 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, var_InheritInteger( p_dec, "avcodec-error-resilience" ); if( var_CreateGetBool( p_dec, "grayscale" ) ) - p_context->flags |= CODEC_FLAG_GRAY; + p_context->flags |= AV_CODEC_FLAG_GRAY; /* ***** Output always the frames ***** */ - p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT; + p_context->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; i_val = var_CreateGetInteger( p_dec, "avcodec-skiploopfilter" ); if( i_val >= 4 ) p_context->skip_loop_filter = AVDISCARD_ALL; @@ -450,7 +450,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, else p_context->skip_loop_filter = AVDISCARD_DEFAULT; if( var_CreateGetBool( p_dec, "avcodec-fast" ) ) - p_context->flags2 |= CODEC_FLAG2_FAST; + p_context->flags2 |= AV_CODEC_FLAG2_FAST; /* ***** libavcodec frame skipping ***** */ p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" ); @@ -476,7 +476,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, p_sys->b_direct_rendering = false; atomic_init(&p_sys->b_dr_failure, false); if( var_CreateGetBool( p_dec, "avcodec-dr" ) && - (p_codec->capabilities & CODEC_CAP_DR1) && + (p_codec->capabilities & AV_CODEC_CAP_DR1) && /* No idea why ... but this fixes flickering on some TSCC streams */ p_sys->p_codec->id != AV_CODEC_ID_TSCC && p_sys->p_codec->id != AV_CODEC_ID_CSCD && @@ -758,7 +758,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error } p_block = pp_block ? *pp_block : NULL; - if(!p_block && !(p_sys->p_codec->capabilities & CODEC_CAP_DELAY) ) + if(!p_block && !(p_sys->p_codec->capabilities & AV_CODEC_CAP_DELAY) ) return NULL; if( p_sys->b_delayed_open ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
