[Bf-blender-cvs] [7095b95] multiview: Fix some building issues (hopefully)
Dalai Felinto
noreply at git.blender.org
Fri Jan 16 22:56:53 CET 2015
Commit: 7095b9555e002e799d9de9e0cd980001cdff6f95
Author: Dalai Felinto
Date: Fri Jan 16 19:56:43 2015 -0200
Branches: multiview
https://developer.blender.org/rB7095b9555e002e799d9de9e0cd980001cdff6f95
Fix some building issues (hopefully)
===================================================================
M source/blender/blenkernel/intern/writeavi.c
M source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index eef0faf..05cde66 100644
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -181,17 +181,15 @@ static void filepath_avi(char *string, RenderData *rd, const char *suffix)
BLI_path_view(string, suffix);
}
-static int start_avi(void *context_v, Scene *scene, RenderData *rd, int rectx, int recty, const char *suffix, ReportList *reports)
+static int start_avi(void *context_v, Scene *UNUSED(scene), RenderData *rd, int rectx, int recty, const char *suffix, ReportList *reports)
{
int x, y;
char name[256];
AviFormat format;
int quality;
double framerate;
-
- (void)scene; /* unused */
AviMovie *avi = context_v;
-
+
filepath_avi(name, rd, suffix);
x = rectx;
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index a8a79cf..f08cf9d 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -215,7 +215,7 @@ static int write_audio_frame(FFMpegContext *context)
#endif // #ifdef WITH_AUDASPACE
/* Allocate a temporary frame */
-static AVFrame *alloc_picture(FFMpegContext *context, int pix_fmt, int width, int height)
+static AVFrame *alloc_picture(int pix_fmt, int width, int height)
{
AVFrame *f;
uint8_t *buf;
@@ -362,7 +362,7 @@ static AVFrame *generate_video_frame(FFMpegContext *context, uint8_t *pixels, Re
AVFrame *rgb_frame;
if (c->pix_fmt != PIX_FMT_BGR32) {
- rgb_frame = alloc_picture(context, PIX_FMT_BGR32, width, height);
+ rgb_frame = alloc_picture(PIX_FMT_BGR32, width, height);
if (!rgb_frame) {
BKE_report(reports, RPT_ERROR, "Could not allocate temporary frame");
return NULL;
@@ -657,7 +657,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
}
av_dict_free(&opts);
- context->current_frame = alloc_picture(context, c->pix_fmt, c->width, c->height);
+ context->current_frame = alloc_picture(c->pix_fmt, c->width, c->height);
context->img_convert_ctx = sws_getContext(c->width, c->height, PIX_FMT_BGR32, c->width, c->height, c->pix_fmt, SWS_BICUBIC,
NULL, NULL, NULL);
More information about the Bf-blender-cvs
mailing list