[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13597] trunk/blender/source/blender/ blenkernel/intern/writeffmpeg.c: == FFMPEG ==

[Peter Schlaile]

Revision: 13597
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13597
Author:   schlaile
Date:     2008-02-06 23:45:46 +0100 (Wed, 06 Feb 2008)

Log Message:
-----------
== FFMPEG ==

Applied  	

[#8213] fix some library calls (freetype,ffmpeg)

to fix a segfault when linking against newer ffmpeg-libs.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2008-02-06 22:37:13 UTC (rev 13596)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2008-02-06 22:45:46 UTC (rev 13597)
@@ -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 @@
 	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 @@
 	}
 	if (outfile && outfile->oformat) {
 		if (!(outfile->oformat->flags & AVFMT_NOFILE)) {
-			url_fclose(&outfile->pb);
+			url_fclose(OUTFILE_PB);
 		}
 	}
 	if (outfile) {