diff options
| author | Campbell Barton <campbell@blender.org> | 2022-02-22 14:38:29 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-02-22 16:00:32 +0300 |
| commit | 4a7559bbcb96a71ad045404d34ba99e0bb4c528c (patch) | |
| tree | f03284a6d9b58fa2dca9825109857ec439c826a7 /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 64293a277f3532c2e3048234950be250e1e9e90c (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/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) { |