[Bf-blender-cvs] [2a5df72d9b3] master: Revert "Cleanup: quiet const cast warning"

Campbell Barton noreply at git.blender.org
Tue Feb 22 00:07:53 CET 2022


Commit: 2a5df72d9b334c4ce4924bd86d00a4fd262b6da0
Author: Campbell Barton
Date:   Tue Feb 22 10:07:01 2022 +1100
Branches: master
https://developer.blender.org/rB2a5df72d9b334c4ce4924bd86d00a4fd262b6da0

Revert "Cleanup: quiet const cast warning"

This reverts commit 626fb290eb43eb43b9451c757b1e906f0b5eeb53.

This was an intentional change for FFMPEG v5.0,
removing the cast should be done in a version check instead.

===================================================================

M	source/blender/blenkernel/intern/writeffmpeg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 61efade9c93..dee852ca33a 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -869,7 +869,7 @@ static int start_ffmpeg_impl(FFMpegContext *context,
 {
   /* Handle to the output file */
   AVFormatContext *of;
-  AVOutputFormat *fmt;
+  const AVOutputFormat *fmt;
   char name[FILE_MAX], error[1024];
   const char **exts;



More information about the Bf-blender-cvs mailing list