summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
committerJan Schmidt <thaytan@noraisin.net>2009-05-15 23:35:06 +0100
commit1beae4829c6b302ac14206b877a0f32db6a12fd6 (patch)
tree17f31636c34a2bc6a7d4913dc0d57e53191748bd
parentc3aed629b31962c1a02f807ddf6a5b18ebf55d4c (diff)
[MOVED FROM BAD] don't mix tabs and spaces
Original commit message from CVS: don't mix tabs and spaces
-rw-r--r--gst/y4m/gsty4mencode.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c
index 3c9c9fbe9..773f96b84 100644
--- a/gst/y4m/gsty4mencode.c
+++ b/gst/y4m/gsty4mencode.c
@@ -92,8 +92,9 @@ gst_y4mencode_get_type (void)
0,
(GInstanceInitFunc) gst_y4mencode_init,
};
+
y4mencode_type = g_type_register_static (GST_TYPE_ELEMENT,
- "GstY4mEncode", &y4mencode_info, 0);
+ "GstY4mEncode", &y4mencode_info, 0);
}
return y4mencode_type;
}
@@ -135,9 +136,9 @@ gst_y4mencode_sinkconnect (GstPad * pad, const GstCaps * caps)
gdouble fps;
gdouble framerates[] = {
00.000,
- 23.976, 24.000, /* 24fps movie */
- 25.000, /* PAL */
- 29.970, 30.000, /* NTSC */
+ 23.976, 24.000, /* 24fps movie */
+ 25.000, /* PAL */
+ 29.970, 30.000, /* NTSC */
50.000,
59.940, 60.000
};
@@ -157,10 +158,10 @@ gst_y4mencode_sinkconnect (GstPad * pad, const GstCaps * caps)
idx = i;
} else {
gdouble old_diff = fabs (framerates[idx] - fps),
- new_diff = fabs (framerates[i] - fps);
+ new_diff = fabs (framerates[i] - fps);
if (new_diff < old_diff) {
- idx = i;
+ idx = i;
}
}
}