bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Moving silence_log_ffmpeg to imbuf (it fits better there and fixes the link error in blenderplayer)

Browse Source
This commit is contained in:
Martin Poirier 2008-11-03 13:33:11 +00:00
parent 858e2ec776
commit 6cc1466c61
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_writeffmpeg.h
View File

@ -59,8 +59,6 @@ extern void start_ffmpeg(struct RenderData *rd, int rectx, int recty);
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

13
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -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 @@ static RenderData *ffmpeg_renderdata = 0;
#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)

15
source/blender/imbuf/intern/util.c
View File

@ -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 @@ static int isqtime (char *name) {
#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()
{