Skip to content

V
vlc
Commit 76f6417b authored by Steve Lhomme's avatar Steve Lhomme
Browse files
Options

mkv.cpp: add support for the basic A_AAC codec ID

parent 071e4fc6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
modules/demux/mkv.cpp
View file @ 76f6417b
...@@ -2357,6 +2357,12 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) ...@@ -2357,6 +2357,12 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
((uint8_t*)tracks[i_track]->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); ((uint8_t*)tracks[i_track]->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1);
((uint8_t*)tracks[i_track]->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tracks[i_track]->fmt.audio.i_channels << 3); ((uint8_t*)tracks[i_track]->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tracks[i_track]->fmt.audio.i_channels << 3);
} }
else if( !strcmp( tracks[i_track]->psz_codec, "A_AAC" ) )
{
tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data;
tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data );
}
else if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) || else if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) ||
!strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) || !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) ||
!strcmp( tracks[i_track]->psz_codec, "A_PCM/FLOAT/IEEE" ) ) !strcmp( tracks[i_track]->psz_codec, "A_PCM/FLOAT/IEEE" ) )
......
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