diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-08 16:52:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-08 16:52:38 +0300 |
| commit | a868e8623ca7218dfa363962e178293f4a8f0690 (patch) | |
| tree | 2c0e08b1b9b810b60c7b19d9dac4fd6e2fb41c36 /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 7079047538da71961102478a23cccdbd62c7cf9d (diff) | |
- RNA support for returning copied strings from functions, flagging strings as PROP_THICK_WRAP does this.
- scene.render_data.frame_path(frame=num), returns the output path for rending images of video.
- scene.render_data.file_extension, readonly attribute, gives the extension ".jpg", ".mov" etc
- player support was guessing names, use the above functions to get the actual names used, accounting for #'s replacing numbers.
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 5b58f0bfedc..920ff255bcc 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -75,7 +75,6 @@ #endif extern void do_init_ffmpeg(); -static void makeffmpegstring(RenderData* rd, char* string); static int ffmpeg_type = 0; static int ffmpeg_codec = CODEC_ID_MPEG4; @@ -638,7 +637,7 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report do_init_ffmpeg(); /* Determine the correct filename */ - makeffmpegstring(rd, name); + filepath_ffmpeg(name, rd); fprintf(stderr, "Starting output to %s(ffmpeg)...\n" " Using type=%d, codec=%d, audio_codec=%d,\n" " video_bitrate=%d, audio_bitrate=%d,\n" @@ -772,7 +771,7 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report ********************************************************************** */ /* Get the output filename-- similar to the other output formats */ -static void makeffmpegstring(RenderData* rd, char* string) { +void filepath_ffmpeg(char* string, RenderData* rd) { // XXX quick define, solve! #define FILE_MAXDIR 256 |