vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Sep 26 23:07:22 2016 +0200| [96c96cb594f5c57383c0a9193d357413a20675a1] | committer: Francois Cartegnie
input: es_out: always match es CC channel by original fourcc otherwise the channel is auto deselected when another one is added > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96c96cb594f5c57383c0a9193d357413a20675a1 --- src/input/es_out.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index 0975916..b82a293 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -1585,7 +1585,7 @@ static bool EsIsSelected( es_out_id_t *es ) bool b_decode = false; if( es->p_master->p_dec ) { - int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec ); + int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_original_fourcc ); if( i_channel != -1 ) input_DecoderGetCcState( es->p_master->p_dec, &b_decode, i_channel ); } @@ -1651,7 +1651,7 @@ static void EsSelect( es_out_t *out, es_out_id_t *es ) if( !es->p_master->p_dec ) return; - i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec ); + i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_original_fourcc ); if( i_channel == -1 || input_DecoderSetCcState( es->p_master->p_dec, true, i_channel ) ) return; } @@ -1712,7 +1712,7 @@ static void EsUnselect( es_out_t *out, es_out_id_t *es, bool b_update ) { if( es->p_master->p_dec ) { - int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec ); + int i_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_original_fourcc ); if( i_channel != -1 ) input_DecoderSetCcState( es->p_master->p_dec, false, i_channel ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
