diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-23 21:16:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-23 21:16:11 +0300 |
commit | 4f8bffa7bfe46192b43c75d864e2117369cbffdd (patch) | |
tree | 3e869e57151f4d487106d59bba1f2282a9578a44 /source/blender/makesrna | |
parent | b79b8478ee3bb1b115c5d6b8bdb0cc74d5169955 (diff) | |
parent | debd9f6ea1286533d4d5c9262fa6724c862fe35e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index d2a7bd65d4a..cc139ec1b89 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5245,7 +5245,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) }; static const EnumPropertyItem ffmpeg_crf_items[] = { - {FFM_CRF_NONE, "NONE", 0, "None; use constant bit-rate", + {FFM_CRF_NONE, "NONE", 0, "None; use custom bitrate", "Use constant bit rate, rather than constant output quality"}, {FFM_CRF_LOSSLESS, "LOSSLESS", 0, "Lossless", ""}, {FFM_CRF_PERC_LOSSLESS, "PERC_LOSSLESS", 0, "Perceptually lossless", ""}, |