Changeset 4703

Show
Ignore:
Timestamp:
03/21/10 23:30:41 (4 years ago)
Author:
soohyunc
Message:

this commit reflects Revision 4701 from the mpeg4 branch.

copied comments follows:
Removed MacOS X 10.3 workaround code originally from Aqua AG vic which I
initially thought was a Quicktime Pthread related issue and wrote so in the
comments.

It was actually to do with the framework initialization not being called.
Framework initialization is not required and shouldn't be used with MacOS X
10.3.9 and later.

Location:
vic/branches/cc
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/cc/main.cpp

    r4184 r4703  
    4747#include <ctype.h> 
    4848 
    49  
    50 #if 0 
    51    // XXX - MacOS X 10.3 Ptheard workaround 
    52    extern "C" void find_macosx_capture_devices(void); 
    53 #endif 
    54  
    5549#ifdef WIN32 
    5650//#include <winsock.h> 
     
    499493#endif 
    500494 
    501 #if 0 
    502        // XXX - MacOS X 10.3 Ptheard workaround 
    503        find_macosx_capture_devices(); 
    504 #endif 
    505495        // Option list; If letter is followed by ':' then it takes an argument 
    506496        const char* options =  
  • vic/branches/cc/video/grabber-macosx.cpp

    r4515 r4703  
    630630 
    631631// Instantiate the video capture device. 
    632 #if 1 
    633 // this doesn't work with MacOS X 10.3 (QuickTime pthread problem), 
    634 // but works fine with 10.4  
    635632static MacOSXScanner find_capture_devices; 
    636 #else 
    637 // this C function is called from main as a workaround for MacOS X 10.3 
    638 extern "C" void find_macosx_capture_devices(void) { 
    639     MacOSXScanner macOSXScanner; 
    640 } 
    641 #endif 
    642633 
    643634MacOSXScanner::MacOSXScanner()