From 4a7559bbcb96a71ad045404d34ba99e0bb4c528c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 22 Feb 2022 22:38:29 +1100 Subject: [PATCH] Cleanup: quiet warnings for FFMPEG before 5.0 Even though 5.0 has been released newer distributions wont include it, so quiet warnings. --- source/blender/blenkernel/intern/writeffmpeg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index dee852ca33a..b9d013d4756 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -960,9 +960,14 @@ static int start_ffmpeg_impl(FFMpegContext *context, break; } - /* Returns after this must 'goto fail;' */ + /* Returns after this must 'goto fail;' */ +# if LIBAVFORMAT_VERSION_MAJOR >= 59 of->oformat = fmt; +# else + /* *DEPRECATED* 2022/08/01 For FFMPEG (<5.0) remove this else branch and the `ifdef` above. */ + of->oformat = (AVOutputFormat *)fmt; +# endif if (video_codec == AV_CODEC_ID_DVVIDEO) { if (rectx != 720) {