From 4ed1d36b7d18597b0175f75485769df6c2da243e Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Sat, 2 Aug 2008 18:01:36 +0000 Subject: gst/matroska/: Fix indention everywhere. A broken indent version has added newlines after every single declaration so... Original commit message from CVS: * gst/matroska/ebml-read.c: (gst_ebml_read_class_init), (gst_ebml_read_change_state), (gst_ebml_read_element_level_up), (gst_ebml_read_peek_bytes), (gst_ebml_read_element_id), (gst_ebml_read_element_length), (gst_ebml_peek_id), (gst_ebml_read_get_length), (gst_ebml_read_skip), (gst_ebml_read_buffer), (gst_ebml_read_bytes), (gst_ebml_read_uint), (gst_ebml_read_sint), (_ext2dbl), (gst_ebml_read_float), (gst_ebml_read_ascii), (gst_ebml_read_date), (gst_ebml_read_master), (gst_ebml_read_binary), (gst_ebml_read_header): * gst/matroska/ebml-write.c: (gst_ebml_write_element_id), (gst_ebml_write_element_size), (gst_ebml_write_uint), (gst_ebml_write_sint), (gst_ebml_write_ascii), (gst_ebml_write_master_start), (gst_ebml_write_master_finish), (gst_ebml_replace_uint): * gst/matroska/matroska-demux.c: (gst_matroska_demux_reset), (gst_matroska_demux_read_track_encoding), (gst_matroska_demux_read_track_encodings), (gst_matroska_demux_add_stream), (gst_matroskademux_do_index_seek), (gst_matroska_demux_send_event), (gst_matroska_demux_element_send_event), (gst_matroska_demux_handle_seek_event), (gst_matroska_demux_handle_src_event), (gst_matroska_demux_init_stream), (gst_matroska_demux_parse_tracks), (gst_matroska_demux_parse_index_cuetrack), (gst_matroska_demux_parse_index_pointentry), (gst_matroska_demux_parse_index), (gst_matroska_demux_parse_info), (gst_matroska_demux_parse_metadata_id_simple_tag), (gst_matroska_demux_parse_metadata_id_tag), (gst_matroska_demux_parse_metadata), (gst_matroska_demux_parse_attached_file), (gst_matroska_demux_parse_attachments), (gst_matroska_demux_parse_chapters), (gst_matroska_ebmlnum_uint), (gst_matroska_ebmlnum_sint), (gst_matroska_demux_push_hdr_buf), (gst_matroska_demux_push_flac_codec_priv_data), (gst_matroska_demux_push_xiph_codec_priv_data), (gst_matroska_demux_push_dvd_clut_change_event), (gst_matroska_demux_add_mpeg_seq_header), (gst_matroska_demux_add_wvpk_header), (gst_matroska_demux_check_subtitle_buffer), (gst_matroska_decode_buffer), (gst_matroska_demux_parse_blockgroup_or_simpleblock), (gst_matroska_demux_parse_cluster), (gst_matroska_demux_parse_contents_seekentry), (gst_matroska_demux_parse_contents), (gst_matroska_demux_loop_stream_parse_id), (gst_matroska_demux_loop_stream), (gst_matroska_demux_loop), (gst_matroska_demux_video_caps), (gst_matroska_demux_audio_caps), (gst_matroska_demux_subtitle_caps), (gst_matroska_demux_change_state): * gst/matroska/matroska-ids.c: * gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init), (gst_matroska_mux_reset), (gst_matroska_mux_handle_sink_event), (gst_matroska_mux_video_pad_setcaps), (xiph3_streamheader_to_codecdata), (vorbis_streamheader_to_codecdata), (theora_streamheader_to_codecdata), (gst_matroska_mux_audio_pad_setcaps), (gst_matroska_mux_request_new_pad), (gst_matroska_mux_release_pad), (gst_matroska_mux_track_header), (gst_matroska_mux_start), (gst_matroska_mux_write_simple_tag), (gst_matroska_mux_finish), (gst_matroska_mux_best_pad), (gst_matroska_mux_write_data), (gst_matroska_mux_collected), (gst_matroska_mux_change_state): Fix indention everywhere. A broken indent version has added newlines after every single declaration some time ago. --- gst/matroska/ebml-read.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gst/matroska/ebml-read.c') diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c index 2220a229..ae673ca5 100644 --- a/gst/matroska/ebml-read.c +++ b/gst/matroska/ebml-read.c @@ -112,7 +112,6 @@ static void gst_ebml_read_class_init (GstEbmlReadClass * klass) { GstElementClass *gstelement_class = (GstElementClass *) klass; - GObjectClass *gobject_class = (GObjectClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -137,7 +136,6 @@ static GstStateChangeReturn gst_ebml_read_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret; - GstEbmlRead *ebml = GST_EBML_READ (element); switch (transition) { @@ -183,7 +181,6 @@ static guint gst_ebml_read_element_level_up (GstEbmlRead * ebml) { guint num = 0; - guint64 pos = ebml->offset; while (ebml->level != NULL) { @@ -214,7 +211,6 @@ gst_ebml_read_peek_bytes (GstEbmlRead * ebml, guint size, GstBuffer ** p_buf, * We do it mainly to avoid pulling buffers of 1 byte all the time */ if (ebml->cached_buffer) { guint64 cache_offset = GST_BUFFER_OFFSET (ebml->cached_buffer); - guint cache_size = GST_BUFFER_SIZE (ebml->cached_buffer); if (cache_offset <= ebml->offset && @@ -313,13 +309,9 @@ static GstFlowReturn gst_ebml_read_element_id (GstEbmlRead * ebml, guint32 * id, guint * level_up) { guint8 *buf; - gint len_mask = 0x80, read = 1, n = 1; - guint32 total; - guint8 b; - GstFlowReturn ret; ret = gst_ebml_read_peek_bytes (ebml, 1, NULL, &buf); @@ -373,13 +365,9 @@ gst_ebml_read_element_length (GstEbmlRead * ebml, guint64 * length, gint * rread) { GstFlowReturn ret; - guint8 *buf; - gint len_mask = 0x80, read = 1, n = 1, num_ffs = 0; - guint64 total; - guint8 b; ret = gst_ebml_read_peek_bytes (ebml, 1, NULL, &buf); @@ -442,9 +430,7 @@ GstFlowReturn gst_ebml_peek_id (GstEbmlRead * ebml, guint * level_up, guint32 * id) { guint64 off; - guint level_up_tmp = 0; - GstFlowReturn ret; g_assert (level_up); @@ -489,7 +475,6 @@ gint64 gst_ebml_read_get_length (GstEbmlRead * ebml) { GstFormat fmt = GST_FORMAT_BYTES; - gint64 end; /* FIXME: what to do if we don't get the upstream length */ @@ -523,9 +508,7 @@ GstFlowReturn gst_ebml_read_skip (GstEbmlRead * ebml) { guint64 length; - guint32 id; - GstFlowReturn ret; ret = gst_ebml_read_element_id (ebml, &id, NULL); @@ -548,7 +531,6 @@ GstFlowReturn gst_ebml_read_buffer (GstEbmlRead * ebml, guint32 * id, GstBuffer ** buf) { guint64 length; - GstFlowReturn ret; ret = gst_ebml_read_element_id (ebml, id, NULL); @@ -579,7 +561,6 @@ gst_ebml_read_bytes (GstEbmlRead * ebml, guint32 * id, guint8 ** data, guint * size) { guint64 length; - GstFlowReturn ret; *size = 0; @@ -615,9 +596,7 @@ GstFlowReturn gst_ebml_read_uint (GstEbmlRead * ebml, guint32 * id, guint64 * num) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -649,11 +628,8 @@ GstFlowReturn gst_ebml_read_sint (GstEbmlRead * ebml, guint32 * id, gint64 * num) { guint8 *data; - guint size; - gboolean negative = 0; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -704,9 +680,7 @@ static gdouble _ext2dbl (guint8 * data) { struct _ext_float ext; - guint64 m = 0; - gint e, i; memcpy (&ext.exponent, data, 2); @@ -733,9 +707,7 @@ GstFlowReturn gst_ebml_read_float (GstEbmlRead * ebml, guint32 * id, gdouble * num) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -779,9 +751,7 @@ GstFlowReturn gst_ebml_read_ascii (GstEbmlRead * ebml, guint32 * id, gchar ** str) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -830,7 +800,6 @@ GstFlowReturn gst_ebml_read_date (GstEbmlRead * ebml, guint32 * id, gint64 * date) { gint64 ebml_date; - GstFlowReturn ret; ret = gst_ebml_read_sint (ebml, id, &ebml_date); @@ -851,9 +820,7 @@ GstFlowReturn gst_ebml_read_master (GstEbmlRead * ebml, guint32 * id) { GstEbmlLevel *level; - guint64 length; - GstFlowReturn ret; ret = gst_ebml_read_element_id (ebml, id, NULL); @@ -882,9 +849,7 @@ gst_ebml_read_binary (GstEbmlRead * ebml, guint32 * id, guint8 ** binary, guint64 * length) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -906,9 +871,7 @@ gst_ebml_read_header (GstEbmlRead * ebml, gchar ** doctype, guint * version) { /* this function is the first to be called */ guint32 id; - guint level_up; - GstFlowReturn ret; /* default init */ -- cgit