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

Conflicts:
	rotord/ofxMovieExporter.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/rotord/ofxMovieExporter.h b/rotord/ofxMovieExporter.h
index 82c574c..ebd794c 100644
--- a/rotord/ofxMovieExporter.h
+++ b/rotord/ofxMovieExporter.h
@@ -122,18 +122,18 @@ class ofxMovieExporter
 		// set an external pixel source, assumes 3 Byte RGB
 		// also sets the recording size but does not crop to the recording area
 		void setPixelSource(unsigned char* pixels, int w, int h);
-		
+
 		// get the number files that have been captured so far
 		int getNumCaptures();
-		
+
 		// reset the filename counter back to 0
 		void resetNumCaptures();
-		
+
 		// get the recording size
 		inline int getRecordingWidth() 	{return outW;}
 		inline int getRecordingHeight() {return outH;}
 
-		void encodeFrame(char *pixels);
+		void encodeFrame(unsigned char *pixels,int w,int h);
 
 	private:
 //#ifdef _THREAD_CAPTURE
@@ -148,7 +148,7 @@ class ofxMovieExporter
 		void clearMemory();
 
 		void encodeFrame();
-		
+
 
 		std::string container;
 		AVCodecID codecId;
@@ -181,7 +181,7 @@ class ofxMovieExporter
 		int posX, posY;
 		int inW, inH;
 		int outW, outH;
-		
+
 		bool usePixelSource;
 		unsigned char* pixelSource;
 	};