diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/blenkernel/intern/writeffmpeg.c | |
parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index b47846cbdec..60a1bdb0458 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -75,7 +75,7 @@ typedef struct FFMpegContext { bool ffmpeg_preview; int ffmpeg_crf; /* set to 0 to not use CRF mode; we have another flag for lossless anyway. */ - int ffmpeg_preset; /* see FFMpegPreset */ + int ffmpeg_preset; /* see eFFMpegPreset */ AVFormatContext *outfile; AVStream *video_stream; |