Commit b1353591 authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf

Added .thd extension and force TrueHD decoder in raw MLP/TrueHD demuxer.

Cherry-picked manually by jb@videolan.org
parent a5ae5407
...@@ -66,6 +66,7 @@ vlc_module_begin () ...@@ -66,6 +66,7 @@ vlc_module_begin ()
add_shortcut( "dts" ) add_shortcut( "dts" )
add_shortcut( "mlp" ) add_shortcut( "mlp" )
add_shortcut( "thd" )
vlc_module_end () vlc_module_end ()
/***************************************************************************** /*****************************************************************************
...@@ -139,6 +140,7 @@ static const codec_t p_codec[] = { ...@@ -139,6 +140,7 @@ static const codec_t p_codec[] = {
{ VLC_FOURCC( 'e', 'a', 'c', '3' ), true, "eac3 audio", EA52Probe, A52Init }, { VLC_FOURCC( 'e', 'a', 'c', '3' ), true, "eac3 audio", EA52Probe, A52Init },
{ VLC_FOURCC( 'd', 't', 's', ' ' ), false, "dts audio", DtsProbe, DtsInit }, { VLC_FOURCC( 'd', 't', 's', ' ' ), false, "dts audio", DtsProbe, DtsInit },
{ VLC_FOURCC( 'm', 'l', 'p', ' ' ), false, "mlp audio", MlpProbe, MlpInit }, { VLC_FOURCC( 'm', 'l', 'p', ' ' ), false, "mlp audio", MlpProbe, MlpInit },
{ VLC_FOURCC( 't', 'r', 'h', 'd' ), false, "mlp audio", MlpProbe, MlpInit },
{ 0, false, NULL, NULL, NULL } { 0, false, NULL, NULL, NULL }
}; };
...@@ -835,7 +837,7 @@ static int MlpCheckSync( const uint8_t *p_peek ) ...@@ -835,7 +837,7 @@ static int MlpCheckSync( const uint8_t *p_peek )
} }
static int MlpProbe( demux_t *p_demux, int64_t *pi_offset ) static int MlpProbe( demux_t *p_demux, int64_t *pi_offset )
{ {
const char *ppsz_name[] = { "mlp", NULL }; const char *ppsz_name[] = { "mlp", "thd", NULL };
return GenericProbe( p_demux, pi_offset, ppsz_name, MlpCheckSync, 4+28+16*4 ); return GenericProbe( p_demux, pi_offset, ppsz_name, MlpCheckSync, 4+28+16*4 );
} }
......
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