diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-02-07 01:45:46 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-02-07 01:45:46 +0300 |
| commit | db6cef56029bbc233d3f559f48dc1934404c4ace (patch) | |
| tree | 91342581049085835c59ea8b1faa401517da32de /source/blender/blenkernel/intern/writeffmpeg.c | |
| parent | 8292f8d4816c48dbb5ac2a669a010ec7ea778027 (diff) | |
== FFMPEG ==
Applied
[#8213] fix some library calls (freetype,ffmpeg)
to fix a segfault when linking against newer ffmpeg-libs.
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index cbaf1f8c605..e4b9940d135 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -41,6 +41,12 @@ #define FFMPEG_CODEC_TIME_BASE 1 #endif +#if LIBAVFORMAT_VERSION_INT >= (52 << 16) +#define OUTFILE_PB (outfile->pb) +#else +#define OUTFILE_PB (&outfile->pb) +#endif + #if defined(WIN32) && (!(defined snprintf)) #define snprintf _snprintf #endif @@ -751,7 +757,7 @@ void append_ffmpeg(int frame, int *pixels, int rectx, int recty) write_video_frame(generate_video_frame((unsigned char*) pixels)); if (ffmpeg_autosplit) { - if (url_ftell(&outfile->pb) > FFMPEG_AUTOSPLIT_SIZE) { + if (url_ftell(OUTFILE_PB) > FFMPEG_AUTOSPLIT_SIZE) { end_ffmpeg(); ffmpeg_autosplit_count++; start_ffmpeg_impl(ffmpeg_renderdata, @@ -798,7 +804,7 @@ void end_ffmpeg(void) } if (outfile && outfile->oformat) { if (!(outfile->oformat->flags & AVFMT_NOFILE)) { - url_fclose(&outfile->pb); + url_fclose(OUTFILE_PB); } } if (outfile) { |