[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17308] trunk/blender/source/blender: Moving silence_log_ffmpeg to imbuf ( it fits better there and fixes the link error in blenderplayer)
Martin Poirier
theeth at yahoo.com
Mon Nov 3 14:33:11 CET 2008
Revision: 17308
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17308
Author: theeth
Date: 2008-11-03 14:33:11 +0100 (Mon, 03 Nov 2008)
Log Message:
-----------
Moving silence_log_ffmpeg to imbuf (it fits better there and fixes the link error in blenderplayer)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/imbuf/intern/util.c
Modified: trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h 2008-11-03 13:00:39 UTC (rev 17307)
+++ trunk/blender/source/blender/blenkernel/BKE_writeffmpeg.h 2008-11-03 13:33:11 UTC (rev 17308)
@@ -59,8 +59,6 @@
extern void end_ffmpeg(void);
extern void append_ffmpeg(int frame, int *pixels, int rectx, int recty);
-void silence_log_ffmpeg(int quiet);
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2008-11-03 13:00:39 UTC (rev 17307)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2008-11-03 13:33:11 UTC (rev 17308)
@@ -34,7 +34,6 @@
#include <ffmpeg/rational.h>
#include <ffmpeg/swscale.h>
#include <ffmpeg/opt.h>
-#include <ffmpeg/log.h>
#if LIBAVFORMAT_VERSION_INT < (49 << 16)
#define FFMPEG_OLD_FRAME_RATE 1
@@ -105,18 +104,6 @@
#define FFMPEG_AUTOSPLIT_SIZE 2000000000
-void silence_log_ffmpeg(int quiet)
-{
- if (quiet)
- {
- av_log_set_level(AV_LOG_QUIET);
- }
- else
- {
- av_log_set_level(AV_LOG_INFO);
- }
-}
-
/* Delete a picture buffer */
static void delete_picture(AVFrame* f)
Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c 2008-11-03 13:00:39 UTC (rev 17307)
+++ trunk/blender/source/blender/imbuf/intern/util.c 2008-11-03 13:33:11 UTC (rev 17308)
@@ -33,7 +33,6 @@
#include "DNA_userdef_types.h"
#include "BKE_global.h"
-#include "BKE_writeffmpeg.h" /* for silence_log_ffmpeg */
#include "imbuf.h"
#include "imbuf_patch.h"
@@ -66,6 +65,7 @@
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
//#include <ffmpeg/avdevice.h>
+#include <ffmpeg/log.h>
#if LIBAVFORMAT_VERSION_INT < (49 << 16)
#define FFMPEG_OLD_FRAME_RATE 1
@@ -231,6 +231,19 @@
#endif
#ifdef WITH_FFMPEG
+
+void silence_log_ffmpeg(int quiet)
+{
+ if (quiet)
+ {
+ av_log_set_level(AV_LOG_QUIET);
+ }
+ else
+ {
+ av_log_set_level(AV_LOG_INFO);
+ }
+}
+
extern void do_init_ffmpeg();
void do_init_ffmpeg()
{
More information about the Bf-blender-cvs
mailing list