diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:00:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:00:52 +0300 |
| commit | 4e4a93bc454d93ec8523f44b73a42977e2868ecc (patch) | |
| tree | 42793167c3b92ed41b276b3de56ebca2b1af2a27 /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 43e0e8defa71bd3086b8547c848f7686e019e51b (diff) | |
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...).
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index d7fcd896e11..fc719634ff5 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -619,7 +619,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int 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) |