Changeset 331
- Timestamp:
- 02/06/07 14:10:02 (2 years ago)
- Files:
-
- trunk/CommonUtils.c (modified) (2 diffs)
- trunk/Perian.xcodeproj/project.pbxproj (modified) (4 diffs)
- trunk/SSARenderCodec.m (modified) (1 diff)
- trunk/SSATagParsing.m.rl (modified) (1 diff)
- trunk/SubImport.mm (modified) (1 diff)
- trunk/VobSubCodec.c (modified) (1 diff)
- trunk/ff_MovieImport.c (modified) (2 diffs)
- trunk/ff_private.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/CommonUtils.c
r242 r331 168 168 return ISO_QTLanguages[i].qtLang; 169 169 } 170 171 return langUnspecified; 170 172 } 171 173 … … 181 183 return ISO_QTLanguages[i].qtLang; 182 184 } 185 186 return langUnspecified; 183 187 } 184 188 trunk/Perian.xcodeproj/project.pbxproj
r330 r331 1807 1807 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; 1808 1808 GCC_PREPROCESSOR_DEFINITIONS = DEBUG_BUILD; 1809 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1810 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; 1811 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1809 1812 HEADER_SEARCH_PATHS = ( 1810 1813 ffmpeg/libavcodec, … … 1862 1865 GCC_PRECOMPILE_PREFIX_HEADER = YES; 1863 1866 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; 1867 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1868 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; 1869 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1864 1870 HEADER_SEARCH_PATHS = ( 1865 1871 ffmpeg/libavcodec, … … 1914 1920 GCC_PRECOMPILE_PREFIX_HEADER = YES; 1915 1921 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; 1922 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1923 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; 1924 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1916 1925 HEADER_SEARCH_PATHS = ( 1917 1926 ffmpeg/libavcodec, … … 2072 2081 GCC_PRECOMPILE_PREFIX_HEADER = YES; 2073 2082 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; 2083 GCC_WARN_ABOUT_RETURN_TYPE = YES; 2084 GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; 2085 GCC_WARN_UNINITIALIZED_AUTOS = YES; 2074 2086 HEADER_SEARCH_PATHS = ( 2075 2087 ffmpeg/libavcodec, trunk/SSARenderCodec.m
r329 r331 103 103 { 104 104 ItemCount breakCount; 105 Fixed penY ,penX;105 Fixed penY=0,penX; 106 106 Fixed lastTopPenY=-1, lastBottomPenY=-1, lastCenterPenY=-1, *storePenY, ignoredPenY; 107 107 int i, lstart, lend, lstep, subcount, j; char direction; trunk/SSATagParsing.m.rl
r329 r331 225 225 ATSUTextLayout cur_layout; 226 226 NSMutableString *output = [NSMutableString string], *dtmp; 227 unichar *p = re->text, *pe = &re->text[len], *numbegin , *strbegin = p, *skipbegin = p, *intbegin, *pb = p, *posbegin, *strparambegin;227 unichar *p = re->text, *pe = &re->text[len], *numbegin = p, *strbegin = p, *skipbegin = p, *intbegin = p, *pb = p, *posbegin=p, *strparambegin=p; 228 228 float num, cur_outline = re->style->outline, cur_shadow = re->style->shadow; 229 229 NSString *parsetmp; 230 int cs, cur_valign=re->valign, cur_halign=re->halign, cur_posx , cur_posy;230 int cs, cur_valign=re->valign, cur_halign=re->halign, cur_posx=-1, cur_posy=-1; 231 231 ssacolors cur_color = re->style->color; 232 232 233 unsigned long inum ;233 unsigned long inum=0; 234 234 unsigned outputoffset=0, lengthreduce=0; 235 BOOL flag , newLayout=FALSE, cur_be = FALSE;235 BOOL flag=0, newLayout=FALSE, cur_be = FALSE; 236 236 Fixed fixv; 237 237 trunk/SubImport.mm
r330 r331 368 368 SubLine *av = (SubLine*)a, *bv = (SubLine*)b; 369 369 370 if (av->begin_time > bv->begin_time) return NSOrderedDesc begining;371 if (av->begin_time < bv->begin_time) return NSOrderedAsc begining;370 if (av->begin_time > bv->begin_time) return NSOrderedDescending; 371 if (av->begin_time < bv->begin_time) return NSOrderedAscending; 372 372 return NSOrderedSame; 373 373 } trunk/VobSubCodec.c
r218 r331 272 272 // if it's raw spu data, the 1st 2 bytes are the length of the data 273 273 if (data[0] + data[1] == 0) { 274 dprintf(" Extacting spu data from PS packets %d\n");274 dprintf(" Extacting spu data from PS packets\n"); 275 275 276 276 data = (UInt8 *) NewPtr(p->bufferSize); trunk/ff_MovieImport.c
r265 r331 376 376 Track *usedTrack, TimeValue atTime, TimeValue *addedDuration, long inFlags, long *outFlags) 377 377 { 378 ComponentResult result ;378 ComponentResult result = noErr; 379 379 ByteIOContext byteContext; 380 380 AVFormatContext *ic = NULL; … … 514 514 ComponentResult FFAvi_MovieImportSetIdleManager(ff_global_ptr storage, IdleManager im) { 515 515 storage->idleManager = im; 516 return noErr; 516 517 } 517 518 trunk/ff_private.c
r296 r331 73 73 { 74 74 int j; 75 AVStream *st ;75 AVStream *st = NULL; 76 76 AVStream *outstr = NULL; 77 77 Media media;
