X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fwav.c;h=3c3a01249da3c22c80fe833e2c64a7309a4054d9;hb=ae2c9e4fb61cd0be61d160d1d0c6aae353706497;hp=f06f83fe8018eabd06a396d7a5888a2a79e98636;hpb=03609aedd3bf7809923406804d5e9ed3f4d91b97;p=vlc diff --git a/modules/demux/wav.c b/modules/demux/wav.c index f06f83fe80..3c3a01249d 100644 --- a/modules/demux/wav.c +++ b/modules/demux/wav.c @@ -323,7 +323,7 @@ static int Open( vlc_object_t * p_this ) &p_sys->fmt ) ) goto error; break; - case VLC_FOURCC( 'm', 's', 0x00, 0x11 ): + case VLC_CODEC_ADPCM_IMA_WAV: if( FrameInfo_IMA_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples, &p_sys->fmt ) ) goto error; @@ -419,7 +419,7 @@ static int Demux( demux_t *p_demux ) } p_block->i_dts = - p_block->i_pts = date_Increment( &p_sys->pts, p_sys->i_frame_samples ); + p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts ); /* set PCR */ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); @@ -433,6 +433,8 @@ static int Demux( demux_t *p_demux ) es_out_Send( p_demux->out, p_sys->p_es, p_block ); + date_Increment( &p_sys->pts, p_sys->i_frame_samples ); + return 1; }