diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-25 06:41:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-25 06:41:30 +0400 |
| commit | e1a54214bbed9b32e1aee0e849ae654c495afa80 (patch) | |
| tree | a95eaa2b98e7baa7e91fa34db46571e531b1cfb3 /source/blender/python/intern/bpy_app_ffmpeg.c | |
| parent | 153eea5f23e2f0060d89a701ddd9b48085fc6070 (diff) | |
code cleanup:
- remove unused defines.
- quiet some shadow warnings.
- bevel, ifdef out some asserts that are too common.
- style
Diffstat (limited to 'source/blender/python/intern/bpy_app_ffmpeg.c')
| -rw-r--r-- | source/blender/python/intern/bpy_app_ffmpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c index 3bf3dec3872..61e12c1cea0 100644 --- a/source/blender/python/intern/bpy_app_ffmpeg.c +++ b/source/blender/python/intern/bpy_app_ffmpeg.c @@ -81,8 +81,10 @@ static PyObject *make_ffmpeg_info(void) #define SetIntItem(flag) \ PyStructSequence_SET_ITEM(ffmpeg_info, pos++, PyLong_FromLong(flag)) #endif +#ifndef WITH_FFMPEG #define SetStrItem(str) \ PyStructSequence_SET_ITEM(ffmpeg_info, pos++, PyUnicode_FromString(str)) +#endif #define SetObjItem(obj) \ PyStructSequence_SET_ITEM(ffmpeg_info, pos++, obj) |