vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Fri Jun 12 15:09:20 2015 +0200| [217b607b75416248512169a96df91fa303159765] | committer: Francois Cartegnie
demux: mp4: move alaw/ulaw builtin codec fixes out of es setup > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=217b607b75416248512169a96df91fa303159765 --- modules/demux/mp4/essetup.c | 5 ----- modules/demux/mp4/mp4.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c index 2c9b7bd..cb2a169 100644 --- a/modules/demux/mp4/essetup.c +++ b/modules/demux/mp4/essetup.c @@ -422,11 +422,6 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample ) p_soun->i_bytes_per_frame = 2 * p_soun->i_channelcount; p_soun->i_bytes_per_sample = 2; break; - case VLC_CODEC_ALAW: - case VLC_FOURCC( 'u', 'l', 'a', 'w' ): - p_soun->i_samplesize = 8; - p_track->i_sample_size = p_soun->i_channelcount; - break; case VLC_FOURCC( 'N', 'O', 'N', 'E' ): case VLC_FOURCC( 'r', 'a', 'w', ' ' ): case VLC_FOURCC( 't', 'w', 'o', 's' ): diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 45b0825..c01730d 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -3038,6 +3038,10 @@ static inline uint32_t MP4_GetFixedSampleSize( const mp4_track_t *p_track, case ATOM_raw: i_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount; break; + case VLC_CODEC_ALAW: + case VLC_FOURCC( 'u', 'l', 'a', 'w' ): + i_size = p_soun->i_channelcount; + break; default: break; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits