From 01a5d96cce0c6e296da3e01c0ba4850afb00bc55 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Mon, 4 Apr 2022 03:33:36 +0300 Subject: [PATCH 61/66] Finished versioning in ffmpeg.C --- cinelerra-5.1/cinelerra/ffmpeg.C | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 5fd9cbe1..ff03e85e 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -380,8 +380,11 @@ AVHWDeviceType FFStream::decode_hw_activate() { return AV_HWDEVICE_TYPE_NONE; } - +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,16,100) int FFStream::decode_hw_format(const AVCodec *decoder, AVHWDeviceType type) +#else +int FFStream::decode_hw_format(AVCodec *decoder, AVHWDeviceType type) +#endif { return 0; } @@ -406,7 +409,11 @@ int FFStream::decode_activate() } while( ret >= 0 && st != 0 && !reading ) { AVCodecID codec_id = st->codecpar->codec_id; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,16,100) const AVCodec *decoder = 0; +#else + AVCodec *decoder = 0; +#endif if( is_video() ) { if( ffmpeg->opt_video_decoder ) decoder = avcodec_find_decoder_by_name(ffmpeg->opt_video_decoder); @@ -1855,7 +1862,11 @@ FFMPEG::~FFMPEG() delete [] opt_hw_dev; } +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,16,100) int FFMPEG::check_sample_rate(const AVCodec *codec, int sample_rate) +#else +int FFMPEG::check_sample_rate(AVCodec *codec, int sample_rate) +#endif { const int *p = codec->supported_samplerates; if( !p ) return sample_rate; -- 2.35.1