[vlc-commits] use fallthrough instead of ft comment
Francois Cartegnie
git at videolan.org
Mon Oct 9 09:49:42 CEST 2017
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Oct 9 09:46:43 2017 +0200| [b9cc9c4206aa7772b7701b6774f6f191c4f7b6cb] | committer: Francois Cartegnie
use fallthrough instead of ft comment
expected by gcc when not using dedicated attribute
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b9cc9c4206aa7772b7701b6774f6f191c4f7b6cb
---
modules/demux/mpeg/ps.c | 2 +-
modules/demux/mpeg/ts_psi.c | 4 ++--
modules/demux/ogg.c | 6 +++---
modules/packetizer/h264_nal.c | 2 +-
modules/stream_out/chromecast/chromecast_ctrl.cpp | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 57cc6a5d7d..185770d56a 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -496,7 +496,7 @@ static int Demux( demux_t *p_demux )
block_Release( p_pkt );
break;
}
- //ft
+ /* fallthrough */
case PS_STREAM_ID_PRIVATE_STREAM1:
case PS_STREAM_ID_EXTENDED:
{
diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index a438ed55d1..22f30bce83 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -298,7 +298,7 @@ static void ParsePMTPrivateRegistrations( demux_t *p_demux, const dvbpsi_descrip
msg_Dbg( p_demux, PMT_DESC_PREFIX "EACEM Simulcast HD" );
break;
}
- //ft
+ /* fallthrough */
}
default:
msg_Dbg( p_demux, PMT_DESC_PREFIX "Unknown Private (0x%x)", p_dr->i_tag );
@@ -1492,7 +1492,7 @@ static void FillPESFromDvbpsiES( demux_t *p_demux,
/* All other private or reserved types */
case 0x13: /* SL in sections */
p_pes->transport = TS_TRANSPORT_SECTIONS;
- //ft
+ /* fallthrough */
case 0x0f:
case 0x10:
case 0x11:
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 1b76c6fde7..bb809a6832 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1239,7 +1239,7 @@ static void Ogg_DecodePacket( demux_t *p_demux,
#ifdef HAVE_LIBVORBIS
Ogg_DecodeVorbisHeader( p_stream, p_oggpacket, p_stream->i_packets_backup );
#endif
- //ft
+ /* fallthrough */
case VLC_CODEC_THEORA:
if( p_stream->i_packets_backup == 3 )
p_stream->b_force_backup = false;
@@ -2733,7 +2733,7 @@ static void Ogg_DecodeVorbisHeader( logical_stream_t *p_stream,
}
vorbis_info_init( p_stream->special.vorbis.p_info );
vorbis_comment_init( p_stream->special.vorbis.p_comment );
- // ft
+ /* fallthrough */
case VORBIS_HEADER_COMMENT:
case VORBIS_HEADER_SETUP:
@@ -2744,7 +2744,7 @@ static void Ogg_DecodeVorbisHeader( logical_stream_t *p_stream,
break;
p_stream->special.vorbis.i_headers_flags |= VORBIS_HEADER_TO_FLAG(i_number);
- // ft
+ /* fallthrough */
default:
break;
diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c
index 29d5c16666..dd3b270ed5 100644
--- a/modules/packetizer/h264_nal.c
+++ b/modules/packetizer/h264_nal.c
@@ -739,7 +739,7 @@ bool h264_get_dpb_values( const h264_sequence_parameter_set_t *p_sps,
i_max_num_reorder_frames = 0; /* all IDR */
break;
}
- // ft
+ /* fallthrough */
default:
i_max_num_reorder_frames = h264_get_max_dpb_frames( p_sps );
break;
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 4c6aa52229..fc213135bb 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -129,12 +129,12 @@ intf_sys_t::~intf_sys_t()
case Seeking:
// Generate the close messages.
m_communication.msgReceiverClose( m_appTransportId );
- // ft
+ /* fallthrough */
case Connecting:
case Connected:
case Launching:
m_communication.msgReceiverClose(DEFAULT_CHOMECAST_RECEIVER);
- // ft
+ /* fallthrough */
default:
break;
}
More information about the vlc-commits
mailing list