diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-03-05 12:22:39 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-03-05 12:22:39 +0300 |
| commit | 381e2d4dc2b2773e348bfb481ab22bb9d553986c (patch) | |
| tree | 6f41b98209a8203391c40a19c3d7fb41b8ea3fa2 /source/blender/python/intern/bpy_app_ffmpeg.c | |
| parent | cf6208382eb6142085e7ce3052b177344ea156cc (diff) | |
| parent | b5d154f400e46ba322f0e08a231bb2557bf51a1e (diff) | |
Merge branch 'master' into temp-spreadsheet-editortemp-spreadsheet-editor
Diffstat (limited to 'source/blender/python/intern/bpy_app_ffmpeg.c')
| -rw-r--r-- | source/blender/python/intern/bpy_app_ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c index 4e396668450..d2261ee7311 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.c +++ b/source/blender/python/intern/bpy_app_ffmpeg.c @@ -116,8 +116,8 @@ static PyObject *make_ffmpeg_info(void) #undef FFMPEG_LIB_VERSION - if (PyErr_Occurred()) { - Py_CLEAR(ffmpeg_info); + if (UNLIKELY(PyErr_Occurred())) { + Py_DECREF(ffmpeg_info); return NULL; } |