Changeset 386b36feda62acb423b13eb23a08be19891e8798

Show
Ignore:
Timestamp:
06/04/06 19:54:21 (3 years ago)
Author:
Christophe Massiot <massiot@videolan.org>
git-committer:
Christophe Massiot <massiot@videolan.org> 1144346061 +0000
git-parent:

[1017d246c12d22caccaf01117ad8e187f14720cf]

git-author:
Christophe Massiot <massiot@videolan.org> 1144346061 +0000
Message:
  • ALL: extention -> extension
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/demux/asf/libasf.c

    r0ade81b r386b36f  
    867867    p_esp->i_average_time_per_frame= GetQWLE( &p_data[52] ); 
    868868    p_esp->i_stream_name_count = GetWLE( &p_data[60] ); 
    869     p_esp->i_payload_extention_system_count = GetWLE( &p_data[62] ); 
     869    p_esp->i_payload_extension_system_count = GetWLE( &p_data[62] ); 
    870870 
    871871    p_data += 64; 
    …… 
    896896    } 
    897897 
    898     for( i = 0; i < p_esp->i_payload_extention_system_count; i++ ) 
     898    for( i = 0; i < p_esp->i_payload_extension_system_count; i++ ) 
    899899    { 
    900900        /* Skip them */ 
    …… 
    947947                 p_esp->pi_stream_name_language[i], 
    948948                 p_esp->ppsz_stream_name[i] ); 
    949     msg_Dbg( s, "  - payload extention system count=%d", 
    950              p_esp->i_payload_extention_system_count ); 
     949    msg_Dbg( s, "  - payload extension system count=%d", 
     950             p_esp->i_payload_extension_system_count ); 
    951951#endif 
    952952    return VLC_SUCCESS; 
    …… 
    13721372    { &asf_object_stream_properties_guid, "Stream Properties" }, 
    13731373    { &asf_object_content_description_guid, "Content Description" }, 
    1374     { &asf_object_header_extension_guid, "Header Extention" }, 
     1374    { &asf_object_header_extension_guid, "Header Extension" }, 
    13751375    { &asf_object_metadata_guid, "Metadata" }, 
    13761376    { &asf_object_codec_list_guid, "Codec List" }, 

  • modules/demux/asf/libasf.h

    r2cb472d r386b36f  
    365365 
    366366    int     i_stream_name_count; 
    367     int     i_payload_extention_system_count; 
     367    int     i_payload_extension_system_count; 
    368368 
    369369    int     *pi_stream_name_language; 

  • modules/demux/m3u.c

    r0ade81b r386b36f  
    120120    } 
    121121 
    122     /* we had no luck looking at the file extention, so we have a look 
     122    /* we had no luck looking at the file extension, so we have a look 
    123123     * at the content. This is useful for .asp, .php and similar files 
    124124     * that are actually html. Also useful for some asx files that have 

  • modules/demux/mod.c

    r0d2c5a8 r386b36f  
    136136    vlc_value_t val; 
    137137 
    138     /* We accept file based on extention match */ 
     138    /* We accept file based on extension match */ 
    139139    if( strcasecmp( p_demux->psz_demux, "mod" ) ) 
    140140    { 

  • modules/demux/mpc.c

    r0d2c5a8 r386b36f  
    114114    if( memcmp( p_peek, "MP+", 3 ) ) 
    115115    { 
    116         /* for v4..6 we check extention file */ 
     116        /* for v4..6 we check extension file */ 
    117117        const int i_version = (GetDWLE( p_peek ) >> 11)&0x3ff; 
    118118 

  • modules/mux/asf.c

    rdfce5fb r386b36f  
    762762static const guid_t asf_object_stream_properties_guid = 
    763763{0xB7DC0791, 0xA9B7, 0x11CF, {0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}}; 
    764 static const guid_t asf_object_header_extention_guid = 
     764static const guid_t asf_object_header_extension_guid = 
    765765{0x5FBF03B5, 0xA92E, 0x11CF, {0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}}; 
    766766static const guid_t asf_object_stream_type_audio = 
    …… 
    894894    bo_addle_u32( &bo, p_sys->i_bitrate );      /* maxbitrate */ 
    895895 
    896     /* header extention */ 
     896    /* header extension */ 
    897897    if( i_header_ext_size ) 
    898898    { 
    899         bo_add_guid ( &bo, &asf_object_header_extention_guid ); 
     899        bo_add_guid ( &bo, &asf_object_header_extension_guid ); 
    900900        bo_addle_u64( &bo, i_header_ext_size ); 
    901901        bo_add_guid ( &bo, &asf_guid_reserved_1 ); 

  • modules/mux/mpeg/pes.c

    r00d18e8 r386b36f  
    125125                bits_write( &bits, 1, 0x00 ); // additional copy info flag 
    126126                bits_write( &bits, 1, 0x00 ); // pes crc flag 
    127                 bits_write( &bits, 1, 0x00 ); // pes extention flags 
     127                bits_write( &bits, 1, 0x00 ); // pes extension flags 
    128128                bits_write( &bits, 8, i_header_size ); // header size -> pts and dts 
    129129 

  • modules/mux/mpeg/ps.c

    rdfce5fb r386b36f  
    607607    if( p_sys->b_mpeg2 ) 
    608608    { 
    609         bits_write( &bits, 9,  0 ); // src extention 
     609        bits_write( &bits, 9,  0 ); // src extension 
    610610    } 
    611611    bits_write( &bits, 1,  1 );     // marker 

  • modules/packetizer/mpegvideo.c

    rbf706ca r386b36f  
    565565        int i_type = p_frag->p_buffer[4] >> 4; 
    566566 
    567         /* Extention start code */ 
     567        /* Extension start code */ 
    568568        if( i_type == 0x01 ) 
    569569        { 
    …… 
    577577#endif 
    578578 
    579             /* sequence extention */ 
     579            /* sequence extension */ 
    580580            if( p_sys->p_ext) block_Release( p_sys->p_ext ); 
    581581            p_sys->p_ext = block_Duplicate( p_frag ); 
    …… 
    605605        else if( i_type == 0x08 ) 
    606606        { 
    607             /* picture extention */ 
     607            /* picture extension */ 
    608608            p_sys->i_picture_structure = p_frag->p_buffer[6]&0x03; 
    609609            p_sys->i_top_field_first   = p_frag->p_buffer[7] >> 7; 

  • modules/stream_out/standard.c

    r50b0184 r386b36f  
    155155    if( psz_url && strrchr( psz_url, '.' ) ) 
    156156    { 
    157         /* by extention */ 
     157        /* by extension */ 
    158158        static struct { char *ext; char *mux; } exttomux[] = 
    159159        { 
    …… 
    179179        int  i; 
    180180 
    181         msg_Dbg( p_this, "extention is %s", psz_ext ); 
     181        msg_Dbg( p_this, "extension is %s", psz_ext ); 
    182182        for( i = 0; exttomux[i].ext != NULL; i++ ) 
    183183        { 
    …… 
    188188            } 
    189189        } 
    190         msg_Dbg( p_this, "extention -> mux=%s", psz_mux_byext ); 
     190        msg_Dbg( p_this, "extension -> mux=%s", psz_mux_byext ); 
    191191    } 
    192192 
    …… 
    198198        { 
    199199            msg_Warn( p_stream, 
    200                       "no access _and_ no muxer, extention gives file/%s", 
     200                      "no access _and_ no muxer, extension gives file/%s", 
    201201                      psz_mux_byext ); 
    202202            psz_access = strdup("file"); 
    …… 
    228228        else 
    229229        { 
    230             msg_Err( p_stream, "no mux specified or found by extention" ); 
     230            msg_Err( p_stream, "no mux specified or found by extension" ); 
    231231            return VLC_EGENERIC; 
    232232        } 

  • src/input/subtitles.c

    re84eada r386b36f  
    6363 
    6464/** 
    65  * The possible extentions for subtitle files we support 
     65 * The possible extensions for subtitle files we support 
    6666 */ 
    6767static const char * sub_exts[] = {  "utf", "utf8", "utf-8", "sub", "srt", "smi", "txt", "ssa", "idx", NULL };