diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-11-08 18:29:56 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-11-08 18:29:56 +0300 |
| commit | aa9b976e9f9b8baff194f5bfadcf9e7694cf8d15 (patch) | |
| tree | b30ce7abaa65be85c147222cb074571c056b59df /intern/ffmpeg/ffmpeg_compat.h | |
| parent | 410b87ca781d6b6b061bab0440005ac1ab82688f (diff) | |
| parent | bbb1d3e5e7eb4059a0324ae786e1e793852963a9 (diff) | |
Merge branch 'master' into temp-gpencil-automasktemp-gpencil-automask
Diffstat (limited to 'intern/ffmpeg/ffmpeg_compat.h')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index f311e04d8e0..f7d87af8bca 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -36,6 +36,14 @@ # define FFMPEG_INLINE static inline #endif +#if (LIBAVFORMAT_VERSION_MAJOR < 59) +/* For versions older than ffmpeg 5.0, use the old channel layout variables. + * We intend to only keep this workaround for around two releases (3.5, 3.6). + * If it sticks around any longer, then we should consider refactoring this. + */ +# define FFMPEG_USE_OLD_CHANNEL_VARS +#endif + #if (LIBAVFORMAT_VERSION_MAJOR < 58) || \ ((LIBAVFORMAT_VERSION_MAJOR == 58) && (LIBAVFORMAT_VERSION_MINOR < 76)) # define FFMPEG_USE_DURATION_WORKAROUND 1 |