Show
Ignore:
Timestamp:
02/09/08 13:55:44 (10 months ago)
Author:
astrange
Message:

Merge 1.1 to trunk. If you're switching, delete ffmpeg/ first!
I haven't merged the nib changes, so the component manager is missing again.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Subtitles/SubRenderer.h

    r675 r806  
    1515          tag_alpha, tag_1a, tag_2a, tag_3a, tag_4a, tag_r} SSATagType; 
    1616 
     17#ifndef __OBJC_GC__ 
     18#ifndef __strong 
     19#define __strong 
     20#endif 
     21#endif 
     22 
    1723@interface SubRenderer : NSObject 
    1824-(void)completedHeaderParsing:(SubContext*)sc;