diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/imbuf/intern/util.c | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 008be2fde74..9c5b39e180d 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -231,8 +231,7 @@ void do_init_ffmpeg(void) ffmpeg_init = 1; av_register_all(); avdevice_register_all(); - - if ((G.f & G_DEBUG) == 0) { + if ((G.debug & G_DEBUG_FFMPEG) == 0) { silence_log_ffmpeg(1); } else { |