videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Merge branch 'mr250701' into 'master' 

demux: mp4: fix playback for twos/sowt spec violation

See merge request videolan/vlc!2270
This commit is contained in:
François Cartegnie 2024-04-28 07:10:59 +00:00
parent 7d6abadd24 0f41dd8b5f
commit 5d21a6ec52
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/demux/mp4/essetup.c
View File

@ -1038,15 +1038,16 @@ int SetupAudioES( demux_t *p_demux, const mp4_track_t *p_track,
}
case VLC_FOURCC( 't', 'w', 'o', 's' ):
p_fmt->i_codec = VLC_CODEC_S16B;
p_fmt->i_original_fourcc = i_sample_type;
p_fmt->audio.i_bitspersample = 16;
break;
case VLC_FOURCC( 's', 'o', 'w', 't' ):
p_fmt->i_codec = VLC_CODEC_S16L;
p_fmt->i_original_fourcc = i_sample_type;
p_fmt->audio.i_bitspersample = 16;
/* We can't trust people to follow spec as they have put
any raw audio, especially S8, into these :/ #27154 */
p_fmt->i_codec = vlc_fourcc_GetCodecAudio( i_sample_type,
p_soun->i_samplesize );
if( p_fmt->i_codec )
{
p_fmt->i_original_fourcc = i_sample_type;
p_fmt->audio.i_bitspersample = p_soun->i_samplesize;
}
break;
case 0x0000000: