more stuff merged in..

This commit is contained in:
Robin Gareus
2010-02-22 22:52:10 +01:00
parent ca07ad9c72
commit e8a7f05923
2 changed files with 7 additions and 2 deletions
+6 -1
View File
@@ -235,7 +235,12 @@ static OSStatus SetNumberValue(CFMutableDictionaryRef inDict,
- (CVTexture *)getTexture
{
return [super getTexture];
CVTexture *ret;
bool gotNewFrame = newFrame;
ret = [super getTexture];
if (gotNewFrame) // task the qtvisualcontext if we got a new frame
[(CVFileInputController *)self task];
return ret;
}
- (BOOL)getFrameForTime:(const CVTimeStamp *)timeStamp
+1 -1
View File
@@ -215,7 +215,7 @@
#define WITH_FREI0R 1
#define BUILD_NUMBER 47
#define BUILD_NUMBER 49
#define OSX_VERSION 0.99