Skip to content

V
vlc-2-2
Commit b0b8cd62 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed some mp4/mov with ac3 audio tracks. 

It closes #3515.
parent 18cc244e
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 3 deletions
modules/demux/mp4/mp4.c
View file @ b0b8cd62
...@@ -1540,6 +1540,28 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1540,6 +1540,28 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
p_soun->i_qt_version = 0; p_soun->i_qt_version = 0;
} }
} }
else if( p_track->fmt.i_cat == AUDIO_ES && p_sample->data.p_sample_soun->i_qt_version == 1 )
{
MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun;
switch( p_sample->i_type )
{
case( VLC_FOURCC( '.', 'm', 'p', '3' ) ):
case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ):
{
if( p_track->i_sample_size > 1 )
p_soun->i_qt_version = 0;
break;
}
case( VLC_FOURCC( 'a', 'c', '-', '3' ) ):
case( VLC_FOURCC( 'e', 'c', '-', '3' ) ):
case( VLC_FOURCC( 'm', 's', 0x20, 0x00 ) ):
p_soun->i_qt_version = 0;
break;
default:
break;
}
}
/* */ /* */
switch( p_track->fmt.i_cat ) switch( p_track->fmt.i_cat )
...@@ -1607,10 +1629,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1607,10 +1629,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
case( VLC_FOURCC( '.', 'm', 'p', '3' ) ): case( VLC_FOURCC( '.', 'm', 'p', '3' ) ):
case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ): case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ):
{ {
MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun;
p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
if( p_track->i_sample_size > 1 )
p_soun->i_qt_version = 0;
break; break;
} }
case( VLC_FOURCC( 'a', 'c', '-', '3' ) ): case( VLC_FOURCC( 'a', 'c', '-', '3' ) ):
......
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