diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
| commit | 43be4343107b1dc2a05353a6ff41360cce27d629 (patch) | |
| tree | ad47af6e9e207dab52df58c269086c100b613f77 /intern | |
| parent | a48186c5d74b3d353c5c65cd4a930dd98cc9a603 (diff) | |
| parent | 4e4a93bc454d93ec8523f44b73a42977e2868ecc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 1eb6c3ba2dc..bc65f19ef59 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -119,6 +119,45 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) #endif +/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though, + * so for now this will do. */ + +#ifndef FF_MIN_BUFFER_SIZE +# ifdef AV_INPUT_BUFFER_MIN_SIZE +# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE +# endif +#endif + +#ifndef FF_INPUT_BUFFER_PADDING_SIZE +# ifdef AV_INPUT_BUFFER_PADDING_SIZE +# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE +# endif +#endif + +#ifndef CODEC_FLAG_GLOBAL_HEADER +# ifdef AV_CODEC_FLAG_GLOBAL_HEADER +# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER +# endif +#endif + +#ifndef CODEC_FLAG_GLOBAL_HEADER +# ifdef AV_CODEC_FLAG_GLOBAL_HEADER +# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER +# endif +#endif + +#ifndef CODEC_FLAG_INTERLACED_DCT +# ifdef AV_CODEC_FLAG_INTERLACED_DCT +# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT +# endif +#endif + +#ifndef CODEC_FLAG_INTERLACED_ME +# ifdef AV_CODEC_FLAG_INTERLACED_ME +# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME +# endif +#endif + /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) # define AV_CODEC_ID_NONE CODEC_ID_NONE |