summaryrefslogtreecommitdiffstats
path: root/ext/metadata/gstbasemetadata.c
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-01-31 10:16:46 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-01-31 10:16:46 +0000
commit19407ba0a127dccc6e8fb10d436c36daadce7919 (patch)
treed15cea7b14f186e65f670f11838a211bdc0a54da /ext/metadata/gstbasemetadata.c
parent5203ce7e1574c79793f4317d099cbd91e409c1d7 (diff)
downloadgst-plugins-bad-19407ba0a127dccc6e8fb10d436c36daadce7919.tar.gz
gst-plugins-bad-19407ba0a127dccc6e8fb10d436c36daadce7919.tar.bz2
gst-plugins-bad-19407ba0a127dccc6e8fb10d436c36daadce7919.zip
ext/metadata/Makefile.am: Add some relevant variables to CFLAGS and LIBADD, for example our compiler warnings paramters.
Original commit message from CVS: * ext/metadata/Makefile.am: Add some relevant variables to CFLAGS and LIBADD, for example our compiler warnings paramters. * ext/metadata/gstbasemetadata.c: (gst_base_metadata_strip_push_buffer), (gst_base_metadata_calculate_offsets), (gst_base_metadata_src_event), (gst_base_metadata_sink_activate): * ext/metadata/gstmetadatademux.c: (gst_metadata_demux_init), (gst_metadata_demux_set_property), (gst_metadata_demux_dispose): * ext/metadata/gstmetadatamux.c: (gst_metadata_mux_init), (gst_metadata_mux_set_property), (gst_metadata_mux_get_property), (gst_metadata_mux_dispose), (gst_metadata_mux_create_chunks_from_tags): * ext/metadata/metadata.c: (metadata_dispose): * ext/metadata/metadataexif.c: (metadataparse_exif_content_foreach_entry_func), (metadatamux_exif_for_each_tag_in_list): * ext/metadata/metadataiptc.c: (metadatamux_iptc_for_each_tag_in_list): * ext/metadata/metadatamuxjpeg.c: (metadatamux_jpeg_lazy_update), (metadatamux_jpeg_reading): * ext/metadata/metadatamuxpng.c: (metadatamux_png_reading): * ext/metadata/metadataparsejpeg.c: (metadataparse_jpeg_reading): * ext/metadata/metadataparsepng.c: * ext/metadata/metadataparseutil.h: * ext/metadata/metadataxmp.c: (metadataparse_xmp_tag_list_add), (metadatamux_xmp_create_chunk_from_tag_list): Fix a million warnings that showed up after the above change.
Diffstat (limited to 'ext/metadata/gstbasemetadata.c')
-rw-r--r--ext/metadata/gstbasemetadata.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/ext/metadata/gstbasemetadata.c b/ext/metadata/gstbasemetadata.c
index 1fc5c4d0..58b610e1 100644
--- a/ext/metadata/gstbasemetadata.c
+++ b/ext/metadata/gstbasemetadata.c
@@ -692,8 +692,6 @@ gst_base_metadata_strip_push_buffer (GstBaseMetadata * base,
if (inject_len) {
for (i = 0; i < inject_len; ++i) {
- int res;
-
if (inject[i].offset_orig >= offset_orig) {
if (G_LIKELY (inject_begin || inject[i].offset_orig > offset_orig)) {
if (inject[i].offset_orig < offset_orig + size_buf_in) {
@@ -838,8 +836,6 @@ inject:
striped_so_far = 0;
j = 0;
for (i = 0; i < inject_len; ++i) {
- int res;
-
while (j < strip_len) {
if (strip[j].offset_orig < inject[i].offset_orig)
striped_so_far += bsize_strip[j++];
@@ -873,9 +869,6 @@ inject:
}
-
-done:
-
if (prepend_size) {
if (injected_bytes == 0 && striped_bytes == 0) {
GstBuffer *new_buf =
@@ -1141,7 +1134,6 @@ static gboolean
gst_base_metadata_calculate_offsets (GstBaseMetadata * base)
{
int i, j;
- guint32 append_size;
guint32 bytes_striped, bytes_inject;
MetadataChunk *strip = META_DATA_STRIP_CHUNKS (base->metadata).chunk;
MetadataChunk *inject = META_DATA_INJECT_CHUNKS (base->metadata).chunk;
@@ -1484,7 +1476,7 @@ gst_base_metadata_src_event (GstPad * pad, GstEvent * event)
goto done;
start = filter->duration + start;
}
- start_type == GST_SEEK_TYPE_SET;
+ start_type = GST_SEEK_TYPE_SET;
if (filter->prepend_buffer) {
gst_buffer_unref (filter->prepend_buffer);
@@ -1509,7 +1501,7 @@ gst_base_metadata_src_event (GstPad * pad, GstEvent * event)
goto done;
stop = filter->duration + stop;
}
- stop_type == GST_SEEK_TYPE_SET;
+ stop_type = GST_SEEK_TYPE_SET;
gst_base_metadata_translate_pos_to_orig (filter, stop, &stop, NULL, 0);
@@ -1814,8 +1806,6 @@ gst_base_metadata_sink_activate (GstPad * pad)
ret = gst_base_metadata_pull_range_parse (filter);
}
-done:
-
if (ret) {
gst_pad_activate_pull (pad, FALSE);
gst_pad_activate_push (filter->srcpad, FALSE);