diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2011-06-26 14:35:52 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2011-06-26 14:35:52 +0000 |
| commit | 08388857ce338c0990b3d0fd86b6d656e95a34ca (patch) | |
| tree | b1901ed07780148372bcc041ab905f98d88f93d0 /graphics/blender/files | |
| parent | 0660937c9d54a48950cc67a6f8a4daacf7caa768 (diff) | |
| download | ports-08388857ce338c0990b3d0fd86b6d656e95a34ca.tar.gz ports-08388857ce338c0990b3d0fd86b6d656e95a34ca.zip | |
Notes
Diffstat (limited to 'graphics/blender/files')
| -rw-r--r-- | graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h | 13 | ||||
| -rw-r--r-- | graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c | 10 |
2 files changed, 5 insertions, 18 deletions
diff --git a/graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h b/graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h deleted file mode 100644 index 895316b2c3d5..000000000000 --- a/graphics/blender/files/patch-intern_audaspace_jack_AUD_JackDevice.h +++ /dev/null @@ -1,13 +0,0 @@ ---- intern/audaspace/jack/AUD_JackDevice..h.orig 2011-05-13 16:00:11.000000000 +0200 -+++ intern/audaspace/jack/AUD_JackDevice.h 2011-05-13 16:00:34.000000000 +0200 -@@ -38,8 +38,8 @@ - - #include <string> - --#include <jack.h> --#include <ringbuffer.h> -+#include <jack/jack.h> -+#include <jack/ringbuffer.h> - - typedef void (*AUD_syncFunction)(void*, int, float); - diff --git a/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c b/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c index 1641a19763da..8a9b87508a25 100644 --- a/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c +++ b/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c @@ -1,16 +1,16 @@ ---- source/blender/blenkernel/intern/writeffmpeg.c.orig 2011-06-24 09:07:48.320613989 +0200 -+++ source/blender/blenkernel/intern/writeffmpeg.c 2011-06-24 09:08:17.697825516 +0200 -@@ -1101,12 +1101,12 @@ +--- source/blender/blenkernel/intern/writeffmpeg.c.orig 2011-06-26 11:28:46.000000000 +0200 ++++ source/blender/blenkernel/intern/writeffmpeg.c 2011-06-26 11:29:27.000000000 +0200 +@@ -1053,12 +1053,12 @@ switch (o->type) { case FF_OPT_TYPE_INT: case FF_OPT_TYPE_INT64: -- val.i = o->default_val; +- val.i = FFMPEG_DEF_OPT_VAL_INT(o); + val.i = o->default_val.i64; idp_type = IDP_INT; break; case FF_OPT_TYPE_DOUBLE: case FF_OPT_TYPE_FLOAT: -- val.f = o->default_val; +- val.f = FFMPEG_DEF_OPT_VAL_DOUBLE(o); + val.f = o->default_val.dbl; idp_type = IDP_FLOAT; break; |