vlc/vlc-3.0 | branch: master | Francois Cartegnie <[email protected]> | Sun Jun 17 19:20:11 2018 +0200| [0df84ea4fb6f837d3f783ba1b78db8d941271ec6] | committer: Jean-Baptiste Kempf
demux: mp4: workaround broken AC3 mapping (cherry picked from commit 66c458f463b87e2ea99260b2984187ad64718fde) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0df84ea4fb6f837d3f783ba1b78db8d941271ec6 --- modules/demux/mp4/essetup.c | 1 + modules/demux/mp4/libmp4.c | 1 + modules/demux/mp4/libmp4.h | 1 + 3 files changed, 3 insertions(+) diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c index 5a516c9654..4b921e726e 100644 --- a/modules/demux/mp4/essetup.c +++ b/modules/demux/mp4/essetup.c @@ -999,6 +999,7 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample ) } break; } + case( ATOM_AC3 ): case( ATOM_ac3 ): { p_track->fmt.i_codec = VLC_CODEC_A52; diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index f3028dcee1..842581f37e 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -4500,6 +4500,7 @@ static const struct { ATOM_soun, MP4_ReadBox_sample_soun, ATOM_stsd }, { ATOM_agsm, MP4_ReadBox_sample_soun, ATOM_stsd }, { ATOM_ac3, MP4_ReadBox_sample_soun, ATOM_stsd }, + { ATOM_AC3, MP4_ReadBox_sample_soun, ATOM_stsd }, { ATOM_eac3, MP4_ReadBox_sample_soun, ATOM_stsd }, { ATOM_fLaC, MP4_ReadBox_sample_soun, ATOM_stsd }, { ATOM_lpcm, MP4_ReadBox_sample_soun, ATOM_stsd }, diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h index 7f2988ba14..d3b0c95c85 100644 --- a/modules/demux/mp4/libmp4.h +++ b/modules/demux/mp4/libmp4.h @@ -176,6 +176,7 @@ typedef int64_t stime_t; #define ATOM_OggS VLC_FOURCC( 'O', 'g', 'g', 'S' ) #define ATOM_agsm VLC_FOURCC( 'a', 'g', 's', 'm' ) #define ATOM_alac VLC_FOURCC( 'a', 'l', 'a', 'c' ) +#define ATOM_AC3 VLC_FOURCC( 'A', 'C', '-', '3' ) #define ATOM_ac3 VLC_FOURCC( 'a', 'c', '-', '3' ) #define ATOM_eac3 VLC_FOURCC( 'e', 'c', '-', '3' ) #define ATOM_dac3 VLC_FOURCC( 'd', 'a', 'c', '3' ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
