vlc | branch: master | Francois Cartegnie <[email protected]> | Tue Jul 24 14:16:51 2018 +0200| [d3a801d1455e776a8786f153512776c9daa819c3] | committer: Francois Cartegnie
demux: avi: fix regression with DVAudio (fix #20643) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3a801d1455e776a8786f153512776c9daa819c3 --- modules/demux/avi/avi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index ff8f471302..d1fdba81b2 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -733,9 +733,9 @@ static int Open( vlc_object_t * p_this ) case( AVIFOURCC_iavs): case( AVIFOURCC_ivas): msg_Dbg( p_demux, "stream[%u] iavs with handler %4.4s", i, (char *)&p_strh->i_handler ); - es_format_Init( &tk->fmt, VIDEO_ES, p_strh->i_handler ); + es_format_Init( &tk->fmt, VIDEO_ES, AVI_FourccGetCodec( VIDEO_ES, p_strh->i_handler ) ); tk->i_samplesize = 0; - tk->i_dv_audio_rate = p_strh->i_handler == VLC_CODEC_DV ? -1 : 0; + tk->i_dv_audio_rate = tk->fmt.i_codec == VLC_CODEC_DV ? -1 : 0; tk->fmt.video.i_visible_width = tk->fmt.video.i_width = p_avih->i_width; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
