Merge branch 'master' of eclectronics.org@eclectronics.org:rotor

Conflicts:
	rotord/ofxMovieExporter.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp
index ab02298..7ad1488 100755
--- a/rotord/rotor.cpp
+++ b/rotord/rotor.cpp
@@ -767,7 +767,7 @@ bool Video_output::render(const float duration, const float framerate,const stri
 	int outH=480;
 	int bitRate=4000000;
 	int frameRate=25;
-	AVCodecID codecId=AV_CODEC_ID_H264;
+	AVCodecID codecId=AV_CODEC_ID_MPEG4;
 	std::string container ="mov";
 
 
@@ -778,7 +778,7 @@ bool Video_output::render(const float duration, const float framerate,const stri
 			float step=1.0f/framerate;
 			float v=0.0f;
 			for (float f=0.0f;f<duration;f+=step) {
-				exporter->encodeFrame(get_output(Frame_spec(f,framerate,outW,outH))->RGBdata);
+				exporter->encodeFrame(get_output(Frame_spec(f,framerate,outW,outH))->RGBdata,outW,outH);
 			}
 			exporter->finishRecord();
 			return true;