mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

all: Don't declare variables in 'for' loops

Browse source
This commit is contained in:
Edward Hervey 2014-06-24 13:46:17 +02:00
parent 104816e906
commit aaee4dc23b
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/mpegts/gst-dvb-descriptor.c
View file

@ -542,6 +542,7 @@ gboolean
gst_mpegts_descriptor_parse_dvb_linkage (const GstMpegTsDescriptor * descriptor, gst_mpegts_descriptor_parse_dvb_linkage (const GstMpegTsDescriptor * descriptor,
GstMpegTsDVBLinkageDescriptor * res) GstMpegTsDVBLinkageDescriptor * res)
{ {
guint i;
guint8 *data, *end; guint8 *data, *end;
g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
@ -627,7 +628,7 @@ gst_mpegts_descriptor_parse_dvb_linkage (const GstMpegTsDescriptor * descriptor,
res->linkage_data = (gpointer) ext_events; res->linkage_data = (gpointer) ext_events;
for (guint8 i = 0; i < *data++;) { for (i = 0; i < *data++;) {
GstMpegTsDVBLinkageExtendedEvent *ext_event; GstMpegTsDVBLinkageExtendedEvent *ext_event;
if (end - data < 3) if (end - data < 3)
@ -1063,6 +1064,7 @@ gst_mpegts_descriptor_parse_dvb_ca_identifier (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
guint16 tmp; guint16 tmp;
guint i;
g_return_val_if_fail (descriptor != NULL && list != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && list != NULL, FALSE);
/* 2 bytes = one entry */ /* 2 bytes = one entry */
@ -1072,7 +1074,7 @@ gst_mpegts_descriptor_parse_dvb_ca_identifier (const GstMpegTsDescriptor *
*list = g_array_new (FALSE, FALSE, sizeof (guint16)); *list = g_array_new (FALSE, FALSE, sizeof (guint16));
for (guint i = 0; i < descriptor->length - 1; i += 2) { for (i = 0; i < descriptor->length - 1; i += 2) {
tmp = GST_READ_UINT16_BE (data); tmp = GST_READ_UINT16_BE (data);
g_array_append_val (*list, tmp); g_array_append_val (*list, tmp);
data += 2; data += 2;
@ -1151,6 +1153,7 @@ gst_mpegts_descriptor_parse_dvb_parental_rating (const GstMpegTsDescriptor
* descriptor, GPtrArray ** rating) * descriptor, GPtrArray ** rating)
{ {
guint8 *data; guint8 *data;
guint i;
g_return_val_if_fail (descriptor != NULL && rating != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && rating != NULL, FALSE);
__common_desc_checks (descriptor, GST_MTS_DESC_DVB_PARENTAL_RATING, 0, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_PARENTAL_RATING, 0, FALSE);
@ -1160,7 +1163,7 @@ gst_mpegts_descriptor_parse_dvb_parental_rating (const GstMpegTsDescriptor
*rating = g_ptr_array_new_with_free_func ((GDestroyNotify) *rating = g_ptr_array_new_with_free_func ((GDestroyNotify)
_gst_mpegts_dvb_parental_rating_item_free); _gst_mpegts_dvb_parental_rating_item_free);
for (guint8 i = 0; i < descriptor->length - 3; i += 4) { for (i = 0; i < descriptor->length - 3; i += 4) {
GstMpegTsDVBParentalRatingItem *item = GstMpegTsDVBParentalRatingItem *item =
g_slice_new0 (GstMpegTsDVBParentalRatingItem); g_slice_new0 (GstMpegTsDVBParentalRatingItem);
g_ptr_array_add (*rating, item); g_ptr_array_add (*rating, item);
@ -1659,6 +1662,7 @@ gst_mpegts_descriptor_parse_dvb_frequency_list (const GstMpegTsDescriptor
{ {
guint8 *data, type, len; guint8 *data, type, len;
guint32 freq; guint32 freq;
guint i;
g_return_val_if_fail (descriptor != NULL && offset != NULL && g_return_val_if_fail (descriptor != NULL && offset != NULL &&
list != NULL, FALSE); list != NULL, FALSE);
@ -1682,7 +1686,7 @@ gst_mpegts_descriptor_parse_dvb_frequency_list (const GstMpegTsDescriptor
len = descriptor->length - 1; len = descriptor->length - 1;
for (guint8 i = 0; i < len - 3; i += 4) { for (i = 0; i < len - 3; i += 4) {
switch (type) { switch (type) {
case 1: case 1:
freq = BCD_32 (data) * 10; freq = BCD_32 (data) * 10;

4
gst/geometrictransform/gstgeometrictransform.c
View file

@ -229,7 +229,7 @@ gst_geometric_transform_transform_frame (GstVideoFilter * vfilter,
{ {
GstGeometricTransform *gt; GstGeometricTransform *gt;
GstGeometricTransformClass *klass; GstGeometricTransformClass *klass;
gint x, y; gint x, y, i;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
gdouble *ptr; gdouble *ptr;
guint8 *in_data; guint8 *in_data;
@ -245,7 +245,7 @@ gst_geometric_transform_transform_frame (GstVideoFilter * vfilter,
/* in AYUV black is not just all zeros: /* in AYUV black is not just all zeros:
* 0x10 is black for Y, * 0x10 is black for Y,
* 0x80 is black for Cr and Cb */ * 0x80 is black for Cr and Cb */
for (int i = 0; i < out_frame->map[0].size; i += 4) for (i = 0; i < out_frame->map[0].size; i += 4)
GST_WRITE_UINT32_BE (out_data + i, 0xff108080); GST_WRITE_UINT32_BE (out_data + i, 0xff108080);
} else { } else {
memset (out_data, 0, out_frame->map[0].size); memset (out_data, 0, out_frame->map[0].size);

3
gst/geometrictransform/gstperspective.c
View file

@ -80,10 +80,11 @@ get_array_from_matrix (GstPerspective * self)
{ {
GValue v = { 0, }; GValue v = { 0, };
GValueArray *va; GValueArray *va;
int i;
va = g_value_array_new (1); va = g_value_array_new (1);
for (int i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
g_value_init (&v, G_TYPE_DOUBLE); g_value_init (&v, G_TYPE_DOUBLE);
g_value_set_double (&v, self->matrix[i]); g_value_set_double (&v, self->matrix[i]);
g_value_array_append (va, &v); g_value_array_append (va, &v);