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/ff_dataref.c

    r703 r806  
    199199 
    200200/* This is the public function to open bytecontext withs datarefs */ 
    201 OSStatus url_open_dataref(ByteIOContext *pb, Handle dataRef, OSType dataRefType, DataHandler *dataHandler, Boolean *wideSupport, int64_t *dataSize) 
     201OSStatus url_open_dataref(ByteIOContext **pb, Handle dataRef, OSType dataRefType, DataHandler *dataHandler, Boolean *wideSupport, int64_t *dataSize) 
    202202{ 
    203203        URLContext *uc; 
    …… 
    217217                return err; 
    218218        } 
    219         uc->filename[0] = '\0'; 
     219        uc->filename = NULL; 
    220220        uc->prot = up; 
    221221        uc->flags = URL_RDONLY; // we're just using the read access...