vlc | branch: master | Steve Lhomme <[email protected]> | Mon Jul 10 11:30:50 2017 +0200| [382f53fac14120e812947f88e916a70119633bd3] | committer: Jean-Baptiste Kempf
demux:aiff: init the ES to "twos" directly Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=382f53fac14120e812947f88e916a70119633bd3 --- modules/demux/aiff.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c index 886412ca24..6413b86d3e 100644 --- a/modules/demux/aiff.c +++ b/modules/demux/aiff.c @@ -119,7 +119,7 @@ static int Open( vlc_object_t *p_this ) /* Fill p_demux field */ DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; - es_format_Init( &p_sys->fmt, AUDIO_ES, 0 ); + es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC( 't', 'w', 'o', 's' ) ); p_sys->i_time = 0; p_sys->i_ssnd_pos = -1; @@ -139,7 +139,6 @@ static int Open( vlc_object_t *p_this ) if( vlc_stream_Peek( p_demux->s, &p_peek, 18+8 ) < 18+8 ) goto error; - es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC( 't', 'w', 'o', 's' ) ); p_sys->fmt.audio.i_channels = GetWBE( &p_peek[8] ); p_sys->fmt.audio.i_bitspersample = GetWBE( &p_peek[14] ); p_sys->fmt.audio.i_rate = GetF80BE( &p_peek[16] ); @@ -161,7 +160,7 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_demux, "SSND: (offset=%d blocksize=%d)", p_sys->i_ssnd_offset, p_sys->i_ssnd_blocksize ); } - if( p_sys->i_ssnd_pos >= 12 && p_sys->fmt.i_cat == AUDIO_ES ) + if( p_sys->i_ssnd_pos >= 12 && p_sys->fmt.audio.i_channels != 0 ) { /* We have found the 2 needed chunks */ break; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
