Changeset 706

Show
Ignore:
Timestamp:
09/26/07 15:46:21 (2 years ago)
Author:
astrange
Message:

Delegate more AVI codecs to the native decoders.
Ignore "Could not find codec parameters" in AVI loading.
Modified patch by Ritsuka; closes #123.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/ff_MovieImport.c

    r702 r706  
    361361                         
    362362                        OSType fourcc = get_avi_strf_fourcc(&byteContext); 
    363                          
    364                         if (codec_get_id(codec_bmp_tags, BSWAP(fourcc)) == CODEC_ID_MJPEG ||  
    365                                codec_get_id(codec_bmp_tags, BSWAP(fourcc)) == CODEC_ID_DVVIDEO
     363                        enum CodecID id = codec_get_id(codec_bmp_tags, BSWAP(fourcc)); 
     364                         
     365                        if (id == CODEC_ID_MJPEG || id == CODEC_ID_DVVIDEO || id == CODEC_ID_RAWVIDEO || id == CODEC_ID_NONE
    366366                                *valid = 0; 
    367367                         
     
    442442        /* Get the Stream Infos if not already read */ 
    443443        result = av_find_stream_info(ic); 
    444         if(result < 0) 
     444         
     445        // -1 means it couldn't understand at least one stream 
     446        // which might just mean we don't have its video decoder enabled 
     447        if(result < 0 && result != -1) 
    445448                goto bail; 
    446449