diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-14 22:15:09 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-14 22:15:09 +0400 |
commit | 0c51010c67f70fa901b74d941c041f06df50201a (patch) | |
tree | 680741d3791427cd303cd9d6537972c1712ae13e /source/blender/blenkernel/intern/writeffmpeg.c | |
parent | 8fd6879b88273ded24ab647ee76a116efb4a18c2 (diff) |
Fix video FFmpeg nt being able to produce video files due to usage of deprecated settings
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index fcfd4f9dd85..dbceba288c7 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1438,20 +1438,26 @@ static void ffmpeg_set_expert_options(RenderData *rd) BKE_ffmpeg_property_add_string(rd, "video", "bf:3"); BKE_ffmpeg_property_add_string(rd, "video", "refs:2"); BKE_ffmpeg_property_add_string(rd, "video", "qcomp:0.6"); - BKE_ffmpeg_property_add_string(rd, "video", "directpred:3"); // Deprecated. BKE_ffmpeg_property_add_string(rd, "video", "trellis:0"); - BKE_ffmpeg_property_add_string(rd, "video", "flags2:wpred"); // Deprecated. BKE_ffmpeg_property_add_string(rd, "video", "weightb:1"); - BKE_ffmpeg_property_add_string(rd, "video", "flags2:dct8x8"); // Deprecated. +#ifdef FFMPEG_HAVE_DEPRECATED_FLAGS2 + BKE_ffmpeg_property_add_string(rd, "video", "flags2:dct8x8"); + BKE_ffmpeg_property_add_string(rd, "video", "directpred:3"); + BKE_ffmpeg_property_add_string(rd, "video", "flags2:fastpskip"); + BKE_ffmpeg_property_add_string(rd, "video", "flags2:wpred"); +#else BKE_ffmpeg_property_add_string(rd, "video", "8x8dct:1"); - BKE_ffmpeg_property_add_string(rd, "video", "flags2:fastpskip"); // Deprecated. BKE_ffmpeg_property_add_string(rd, "video", "fast-pskip:1"); BKE_ffmpeg_property_add_string(rd, "video", "wpredp:2"); +#endif if (rd->ffcodecdata.flags & FFMPEG_LOSSLESS_OUTPUT) { - BKE_ffmpeg_property_add_string(rd, "video", "cqp:0"); // Deprecated. +#ifdef FFMPEG_HAVE_DEPRECATED_FLAGS2 + BKE_ffmpeg_property_add_string(rd, "video", "cqp:0"); +#else BKE_ffmpeg_property_add_string(rd, "video", "qp:0"); +#endif } } else if (codec_id == AV_CODEC_ID_DNXHD) { |