Control: tags -1 patch fixed-upstream Hi,
On Wed, 24 Jan 2018 22:26:50 +0000 jcowg...@debian.org wrote: > Source: blender > Version: 2.79+dfsg0-3 > Severity: important > User: debian-multime...@lists.debian.org > Usertags: ffmpeg-3.5-transition > > Hi, > > Your package FTBFS with the upcoming version 3.5 of FFmpeg. This is fixed upstream by this commit: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commit/4e4a93bc454d93ec8523f44b73a42977e2868ecc I've attached a patch (which is identical to the upstream commit). James
From 4e4a93bc454d93ec8523f44b73a42977e2868ecc Mon Sep 17 00:00:00 2001 From: Bastien Montagne <montagn...@wanadoo.fr> Date: Tue, 8 May 2018 16:00:52 +0200 Subject: [PATCH] Fix building with latest versions of ffmpeg. Some years-old deprecated stuff has now been removed. Correct solution is probably to use valid defines etc. in own code, but this is more FFMEPG maintainer task (since it also may change how old FFMPEG we do support...). --- intern/ffmpeg/ffmpeg_compat.h | 39 +++++++++++++++++++ .../blender/blenkernel/intern/writeffmpeg.c | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -109,6 +109,45 @@ int av_sample_fmt_is_planar(enum AVSampl #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 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -605,7 +605,8 @@ static AVStream *alloc_video_stream(FFMp c->rc_buffer_aggressivity = 1.0; #endif - c->me_method = ME_EPZS; + /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ + //c->me_method = ME_EPZS; codec = avcodec_find_encoder(c->codec_id); if (!codec)
signature.asc
Description: OpenPGP digital signature
