Commit: 4a7559bbcb96a71ad045404d34ba99e0bb4c528c
Author: Campbell Barton
Date: Tue Feb 22 22:38:29 2022 +1100
Branches: master
https://developer.blender.org/rB4a7559bbcb96a71ad045404d34ba99e0bb4c528c
Cleanup: quiet warnings for FFMPEG before 5.0
Even though 5.0 has been released newer distributions wont include it,
so quiet warnings.
===================================================================
M source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
