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 /source/blender/blenkernel/intern/writeffmpeg.c | |
| 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 '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 39174620961..1f819571b11 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -615,7 +615,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) |