Commit 217b607b authored by Francois Cartegnie's avatar Francois Cartegnie

demux: mp4: move alaw/ulaw builtin codec fixes out of es setup

parent 3dcf2fda
......@@ -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' ):
......
......@@ -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;
}
......
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