[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25834] trunk/blender/source/blender/ blenkernel/intern: error in last commit

[Campbell Barton]

Revision: 25834
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25834
Author:   campbellbarton
Date:     2010-01-08 15:28:04 +0100 (Fri, 08 Jan 2010)

Log Message:
-----------
error in last commit

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

Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c	2010-01-08 13:52:38 UTC (rev 25833)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c	2010-01-08 14:28:04 UTC (rev 25834)
@@ -100,7 +100,7 @@
 		mh.start_movie = start_ffmpeg;
 		mh.append_movie = append_ffmpeg;
 		mh.end_movie = end_ffmpeg;
-		mh.get_movie_path = makeffmpegstring;
+		mh.get_movie_path = filepath_ffmpeg;
 	}
 #endif
 	if (imtype == R_FRAMESERVER) {

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-01-08 13:52:38 UTC (rev 25833)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-01-08 14:28:04 UTC (rev 25834)
@@ -75,7 +75,6 @@
 #endif
 
 extern void do_init_ffmpeg();
-static void makeffmpegstring(char* string, RenderData* rd);
 
 static int ffmpeg_type = 0;
 static int ffmpeg_codec = CODEC_ID_MPEG4;