Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-02-22 14:38:29 +0300
committerJacques Lucke <jacques@blender.org>2022-02-22 17:11:35 +0300
commit1d4037645fb5467f71258883b12dc734532cde44 (patch)
treeef6974591ab63ab86158720dc89f15be8706042e /source/blender/blenkernel
parent66f3545a0b4f76e9355e58f5b1881b3ba201d4dd (diff)
Cleanup: quiet warnings for FFMPEG before 5.0
Even though 5.0 has been released newer distributions wont include it, so quiet warnings.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 45bd977c109..36b3dedeeb0 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -974,9 +974,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) {