diff options
author | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2018-10-18 16:43:06 +0300 |
commit | 41216d5ad4c722e2ad9f15c968af454fc7566d5e (patch) | |
tree | f68fe3e1dd32a2d651b6678a1783e165ce2e70c8 /source/blender/blenkernel/intern/writeffmpeg.c | |
parent | cfdd902d2d5d560262d1218861ad1a4469c5259f (diff) |
Cleanup: Remove more #if 0 blocks
Continuation of https://developer.blender.org/D3802
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3808
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 9cdb48998a0..d53cba184ad 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -607,14 +607,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int } } -#if 0 - /* this options are not set in ffmpeg.c and leads to artifacts with MPEG-4 - * see #33586: Encoding to mpeg4 makes first frame(s) blocky - */ - c->rc_initial_buffer_occupancy = rd->ffcodecdata.rc_buffer_size * 3 / 4; - c->rc_buffer_aggressivity = 1.0; -#endif - /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ //c->me_method = ME_EPZS; @@ -670,14 +662,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int } } - if ((of->oformat->flags & AVFMT_GLOBALHEADER) -#if 0 - || STREQ(of->oformat->name, "mp4") - || STREQ(of->oformat->name, "mov") - || STREQ(of->oformat->name, "3gp") -#endif - ) - { + if ((of->oformat->flags & AVFMT_GLOBALHEADER)) { PRINT("Using global header\n"); c->flags |= CODEC_FLAG_GLOBAL_HEADER; } @@ -1295,12 +1280,6 @@ static void end_ffmpeg_impl(FFMpegContext *context, int is_autosplit) { PRINT("Closing ffmpeg...\n"); -#if 0 - if (context->audio_stream) { /* SEE UPPER */ - write_audio_frames(context); - } -#endif - #ifdef WITH_AUDASPACE if (is_autosplit == false) { if (context->audio_mixdown_device) { |