vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Thu Sep 22 21:35:43 2016 +0200| [123af3db40d9a37a4a7f3ad85a5c305453966af5] | committer: Francois Cartegnie
cc: use VLC_CODEC defined cc channels > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=123af3db40d9a37a4a7f3ad85a5c305453966af5 --- modules/demux/ty.c | 8 ++++---- src/input/decoder.c | 8 ++++---- src/input/es_out.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/demux/ty.c b/modules/demux/ty.c index 1c66941..24648a2 100644 --- a/modules/demux/ty.c +++ b/modules/demux/ty.c @@ -771,10 +771,10 @@ static int DemuxRecVideo( demux_t *p_demux, ty_rec_hdr_t *rec_hdr, block_t *p_bl for( i = 0; i < 4; i++ ) { static const vlc_fourcc_t fcc[4] = { - VLC_FOURCC('c', 'c', '1', ' '), - VLC_FOURCC('c', 'c', '2', ' '), - VLC_FOURCC('c', 'c', '3', ' '), - VLC_FOURCC('c', 'c', '4', ' ') + VLC_CODEC_EIA608_1, + VLC_CODEC_EIA608_2, + VLC_CODEC_EIA608_3, + VLC_CODEC_EIA608_4, }; static const char *ppsz_description[4] = { N_("Closed captions 1"), diff --git a/src/input/decoder.c b/src/input/decoder.c index eafc065..0d28bef 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -2112,10 +2112,10 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel ) if( b_decode ) { static const vlc_fourcc_t fcc[4] = { - VLC_FOURCC('c', 'c', '1', ' '), - VLC_FOURCC('c', 'c', '2', ' '), - VLC_FOURCC('c', 'c', '3', ' '), - VLC_FOURCC('c', 'c', '4', ' '), + VLC_CODEC_EIA608_1, + VLC_CODEC_EIA608_2, + VLC_CODEC_EIA608_3, + VLC_CODEC_EIA608_4, }; decoder_t *p_cc; es_format_t fmt; diff --git a/src/input/es_out.c b/src/input/es_out.c index d22d2b5..0975916 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -200,10 +200,10 @@ static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm ); static char *EsInfoCategoryName( es_out_id_t* es ); static const vlc_fourcc_t EsOutFourccClosedCaptions[4] = { - VLC_FOURCC('c', 'c', '1', ' '), - VLC_FOURCC('c', 'c', '2', ' '), - VLC_FOURCC('c', 'c', '3', ' '), - VLC_FOURCC('c', 'c', '4', ' '), + VLC_CODEC_EIA608_1, + VLC_CODEC_EIA608_2, + VLC_CODEC_EIA608_3, + VLC_CODEC_EIA608_4, }; static inline int EsOutGetClosedCaptionsChannel( vlc_fourcc_t fcc ) { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits