Commit 386b36fe authored by Christophe Massiot's avatar Christophe Massiot

* ALL: extention -> extension

parent 1017d246
......@@ -866,7 +866,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
p_esp->i_language_index = GetWLE( &p_data[50] );
p_esp->i_average_time_per_frame= GetQWLE( &p_data[52] );
p_esp->i_stream_name_count = GetWLE( &p_data[60] );
p_esp->i_payload_extention_system_count = GetWLE( &p_data[62] );
p_esp->i_payload_extension_system_count = GetWLE( &p_data[62] );
p_data += 64;
......@@ -895,7 +895,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
p_esp->ppsz_stream_name[i] = psz;
}
for( i = 0; i < p_esp->i_payload_extention_system_count; i++ )
for( i = 0; i < p_esp->i_payload_extension_system_count; i++ )
{
/* Skip them */
int i_size = GetDWLE( &p_data[16 + 2] );
......@@ -946,8 +946,8 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
msg_Dbg( s, " - lang id=%d name=%s",
p_esp->pi_stream_name_language[i],
p_esp->ppsz_stream_name[i] );
msg_Dbg( s, " - payload extention system count=%d",
p_esp->i_payload_extention_system_count );
msg_Dbg( s, " - payload extension system count=%d",
p_esp->i_payload_extension_system_count );
#endif
return VLC_SUCCESS;
}
......@@ -1371,7 +1371,7 @@ static const struct
{ &asf_object_file_properties_guid, "File Properties" },
{ &asf_object_stream_properties_guid, "Stream Properties" },
{ &asf_object_content_description_guid, "Content Description" },
{ &asf_object_header_extension_guid, "Header Extention" },
{ &asf_object_header_extension_guid, "Header Extension" },
{ &asf_object_metadata_guid, "Metadata" },
{ &asf_object_codec_list_guid, "Codec List" },
{ &asf_object_marker_guid, "Marker" },
......
......@@ -364,7 +364,7 @@ typedef struct
int64_t i_average_time_per_frame;
int i_stream_name_count;
int i_payload_extention_system_count;
int i_payload_extension_system_count;
int *pi_stream_name_language;
char **ppsz_stream_name;
......
......@@ -119,7 +119,7 @@ static int Activate( vlc_object_t * p_this )
i_type = TYPE_B4S;
}
/* we had no luck looking at the file extention, so we have a look
/* we had no luck looking at the file extension, so we have a look
* at the content. This is useful for .asp, .php and similar files
* that are actually html. Also useful for some asx files that have
* another extension */
......
......@@ -135,7 +135,7 @@ static int Open( vlc_object_t *p_this )
ModPlug_Settings settings;
vlc_value_t val;
/* We accept file based on extention match */
/* We accept file based on extension match */
if( strcasecmp( p_demux->psz_demux, "mod" ) )
{
if( ( ext = strchr( p_demux->psz_path, '.' ) ) == NULL ||
......
......@@ -113,7 +113,7 @@ static int Open( vlc_object_t * p_this )
if( memcmp( p_peek, "MP+", 3 ) )
{
/* for v4..6 we check extention file */
/* for v4..6 we check extension file */
const int i_version = (GetDWLE( p_peek ) >> 11)&0x3ff;
if( i_version < 4 || i_version > 6 )
......
......@@ -761,7 +761,7 @@ static const guid_t asf_object_file_properties_guid =
{0x8cabdca1, 0xa947, 0x11cf, {0x8e, 0xe4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
static const guid_t asf_object_stream_properties_guid =
{0xB7DC0791, 0xA9B7, 0x11CF, {0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
static const guid_t asf_object_header_extention_guid =
static const guid_t asf_object_header_extension_guid =
{0x5FBF03B5, 0xA92E, 0x11CF, {0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
static const guid_t asf_object_stream_type_audio =
{0xF8699E40, 0x5B4D, 0x11CF, {0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B}};
......@@ -893,10 +893,10 @@ static block_t *asf_header_create( sout_mux_t *p_mux, vlc_bool_t b_broadcast )
bo_addle_u32( &bo, p_sys->i_packet_size ); /* packet size max */
bo_addle_u32( &bo, p_sys->i_bitrate ); /* maxbitrate */
/* header extention */
/* header extension */
if( i_header_ext_size )
{
bo_add_guid ( &bo, &asf_object_header_extention_guid );
bo_add_guid ( &bo, &asf_object_header_extension_guid );
bo_addle_u64( &bo, i_header_ext_size );
bo_add_guid ( &bo, &asf_guid_reserved_1 );
bo_addle_u16( &bo, 6 );
......
......@@ -124,7 +124,7 @@ static inline int PESHeader( uint8_t *p_hdr, mtime_t i_pts, mtime_t i_dts,
bits_write( &bits, 1, 0x00 ); // dsm trick mode flag
bits_write( &bits, 1, 0x00 ); // additional copy info flag
bits_write( &bits, 1, 0x00 ); // pes crc flag
bits_write( &bits, 1, 0x00 ); // pes extention flags
bits_write( &bits, 1, 0x00 ); // pes extension flags
bits_write( &bits, 8, i_header_size ); // header size -> pts and dts
/* write pts */
......
......@@ -606,7 +606,7 @@ static void MuxWritePackHeader( sout_mux_t *p_mux, block_t **p_buf,
if( p_sys->b_mpeg2 )
{
bits_write( &bits, 9, 0 ); // src extention
bits_write( &bits, 9, 0 ); // src extension
}
bits_write( &bits, 1, 1 ); // marker
......
......@@ -564,7 +564,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
{
int i_type = p_frag->p_buffer[4] >> 4;
/* Extention start code */
/* Extension start code */
if( i_type == 0x01 )
{
#if 0
......@@ -576,7 +576,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
};
#endif
/* sequence extention */
/* sequence extension */
if( p_sys->p_ext) block_Release( p_sys->p_ext );
p_sys->p_ext = block_Duplicate( p_frag );
......@@ -604,7 +604,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
}
else if( i_type == 0x08 )
{
/* picture extention */
/* picture extension */
p_sys->i_picture_structure = p_frag->p_buffer[6]&0x03;
p_sys->i_top_field_first = p_frag->p_buffer[7] >> 7;
p_sys->i_repeat_first_field= (p_frag->p_buffer[7]>>1)&0x01;
......
......@@ -154,7 +154,7 @@ static int Open( vlc_object_t *p_this )
/* ext -> muxer name */
if( psz_url && strrchr( psz_url, '.' ) )
{
/* by extention */
/* by extension */
static struct { char *ext; char *mux; } exttomux[] =
{
{ "avi", "avi" },
......@@ -178,7 +178,7 @@ static int Open( vlc_object_t *p_this )
char *psz_ext = strrchr( psz_url, '.' ) + 1;
int i;
msg_Dbg( p_this, "extention is %s", psz_ext );
msg_Dbg( p_this, "extension is %s", psz_ext );
for( i = 0; exttomux[i].ext != NULL; i++ )
{
if( !strcasecmp( psz_ext, exttomux[i].ext ) )
......@@ -187,7 +187,7 @@ static int Open( vlc_object_t *p_this )
break;
}
}
msg_Dbg( p_this, "extention -> mux=%s", psz_mux_byext );
msg_Dbg( p_this, "extension -> mux=%s", psz_mux_byext );
}
/* We fix access/mux to valid couple */
......@@ -197,7 +197,7 @@ static int Open( vlc_object_t *p_this )
if( psz_mux_byext )
{
msg_Warn( p_stream,
"no access _and_ no muxer, extention gives file/%s",
"no access _and_ no muxer, extension gives file/%s",
psz_mux_byext );
psz_access = strdup("file");
psz_mux = strdup(psz_mux_byext);
......@@ -227,7 +227,7 @@ static int Open( vlc_object_t *p_this )
}
else
{
msg_Err( p_stream, "no mux specified or found by extention" );
msg_Err( p_stream, "no mux specified or found by extension" );
return VLC_EGENERIC;
}
}
......
......@@ -62,7 +62,7 @@
/**
* The possible extentions for subtitle files we support
* The possible extensions for subtitle files we support
*/
static const char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "txt", "ssa", "idx", NULL };
/* extensions from unsupported types */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment