diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
| commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
| tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/avi/intern/avi_options.c | |
| parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
| parent | b3727668168075137f2ded11d7a7821548e4451d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/avi/intern/avi_options.c')
| -rw-r--r-- | source/blender/avi/intern/avi_options.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/avi/intern/avi_options.c b/source/blender/avi/intern/avi_options.c index f6da824a9f7..d59a8a0118a 100644 --- a/source/blender/avi/intern/avi_options.c +++ b/source/blender/avi/intern/avi_options.c @@ -129,4 +129,3 @@ AviError AVI_set_compress_option(AviMovie *movie, int option_type, int stream, A return AVI_ERROR_NONE; } - |