Commit bf49ec23 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

E-AC3 support in mkv files.

parent 434acb18
...@@ -8,6 +8,7 @@ Inputs: ...@@ -8,6 +8,7 @@ Inputs:
Decoders: Decoders:
* AES3 (SMPTE 302M) support * AES3 (SMPTE 302M) support
* E-AC3 (A/52b) support
Stream output: Stream output:
* Restored the old mpeg2 transrating module. * Restored the old mpeg2 transrating module.
......
...@@ -859,6 +859,11 @@ static const struct ...@@ -859,6 +859,11 @@ static const struct
{ VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */ { VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */
AUDIO_ES, "A52 Audio (aka AC3)" }, AUDIO_ES, "A52 Audio (aka AC3)" },
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0)
{ VLC_FOURCC('e','a','c','3'), CODEC_ID_EAC3,
AUDIO_ES, "A/52 B Audio (aka E-AC3)" },
#endif
/* DTS Audio */ /* DTS Audio */
{ VLC_FOURCC('d','t','s',' '), CODEC_ID_DTS, { VLC_FOURCC('d','t','s',' '), CODEC_ID_DTS,
AUDIO_ES, "DTS Audio" }, AUDIO_ES, "DTS Audio" },
......
...@@ -2410,6 +2410,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) ...@@ -2410,6 +2410,10 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
{ {
tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
} }
else if( !strcmp( tracks[i_track]->psz_codec, "A_EAC3" ) )
{
tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' );
}
else if( !strcmp( tracks[i_track]->psz_codec, "A_DTS" ) ) else if( !strcmp( tracks[i_track]->psz_codec, "A_DTS" ) )
{ {
tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
......
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