Changeset 4701

Show
Ignore:
Timestamp:
03/21/10 02:38:42 (4 years ago)
Author:
douglask
Message:

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/mpeg4
Files:
2 modified

Legend:

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

    r4604 r4701  
    4242#include <ctype.h> 
    4343 
    44  
    45 #if 0 
    46    // XXX - MacOS X 10.3 Ptheard workaround 
    47    extern "C" void find_macosx_capture_devices(void); 
    48 #endif 
    49  
    5044#ifdef WIN32 
    5145//#include <winsock.h> 
     
    530524#endif 
    531525 
    532 #if 0 
    533        // XXX - MacOS X 10.3 Ptheard workaround 
    534        find_macosx_capture_devices(); 
    535 #endif 
    536526        // Option list; If letter is followed by ':' then it takes an argument 
    537527        const char* options =  
  • vic/branches/mpeg4/video/grabber-macosx.cpp

    r4577 r4701  
    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()