From: Wim Taymans Date: Mon, 28 Feb 2011 11:06:12 +0000 (+0100) Subject: Merge branch 'master' into 0.11 X-Git-Tag: 1.19.3~507^2~16062 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2eb38991c6d67e47ef90246b2561588cf4b5f390;p=platform%2Fupstream%2Fgstreamer.git Merge branch 'master' into 0.11 Conflicts: configure.ac win32/common/config.h --- 2eb38991c6d67e47ef90246b2561588cf4b5f390 diff --cc gst/jp2kdecimator/jp2kcodestream.c index e5c67e0,6fb2878..cbff654 --- a/gst/jp2kdecimator/jp2kcodestream.c +++ b/gst/jp2kdecimator/jp2kcodestream.c @@@ -413,8 -413,8 +413,8 @@@ init_packet_iterator (GstJP2kDecimator it->n_layers = (tile->cod) ? tile->cod->n_layers : header->cod.n_layers; it->n_resolutions = 1 + -- ((tile->cod) ? tile->cod->n_decompositions : header-> -- cod.n_decompositions); ++ ((tile->cod) ? tile->cod->n_decompositions : header->cod. ++ n_decompositions); it->n_components = header->siz.n_components; it->tx0 = tile->tx0; @@@ -457,8 -457,8 +457,8 @@@ } order = -- (tile->cod) ? tile->cod->progression_order : header-> -- cod.progression_order; ++ (tile->cod) ? tile->cod->progression_order : header->cod. ++ progression_order; if (order == PROGRESSION_ORDER_LRCP) { it->next = packet_iterator_next_lrcp; } else if (order == PROGRESSION_ORDER_RLCP) { @@@ -574,8 -574,8 +574,8 @@@ parse_cod (GstJP2kDecimator * self, Gst } Scod = gst_byte_reader_get_uint8_unchecked (reader); -- cod->sop = ! !(Scod & 0x02); -- cod->eph = ! !(Scod & 0x04); ++ cod->sop = !!(Scod & 0x02); ++ cod->eph = !!(Scod & 0x04); /* SGcod */ cod->progression_order = gst_byte_reader_get_uint8_unchecked (reader); @@@ -642,8 -642,8 +642,8 @@@ write_cod (GstJP2kDecimator * self, Gst /* Scod */ tmp = -- (cod->PPx ? 0x01 : 0x00) | (cod-> -- sop ? 0x02 : 0x00) | (cod->eph ? 0x04 : 0x00); ++ (cod->PPx ? 0x01 : 0x00) | (cod->sop ? 0x02 : 0x00) | (cod-> ++ eph ? 0x04 : 0x00); gst_byte_writer_put_uint8_unchecked (writer, tmp); /* SGcod */ diff --cc gst/mxf/mxfdemux.c index 6e1faa0,3db4413..55704b9 --- a/gst/mxf/mxfdemux.c +++ b/gst/mxf/mxfdemux.c @@@ -611,11 -611,11 +611,11 @@@ gst_mxf_demux_choose_package (GstMXFDem for (i = 0; i < demux->preface->content_storage->n_packages; i++) { if (demux->preface->content_storage->packages[i] && -- MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage-> -- packages[i])) { ++ MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface-> ++ content_storage->packages[i])) { ret = -- MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage-> -- packages[i]); ++ MXF_METADATA_GENERIC_PACKAGE (demux->preface-> ++ content_storage->packages[i]); break; } } @@@ -775,8 -775,8 +775,8 @@@ gst_mxf_demux_update_essence_tracks (Gs essence_container); if (track->parent.type == MXF_METADATA_TRACK_PICTURE_ESSENCE) { -- if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent. -- descriptor[0])) ++ if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track-> ++ parent.descriptor[0])) mxf_ul_to_string (&MXF_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.descriptor[0])->picture_essence_coding, essence_compression); @@@ -785,8 -785,8 +785,8 @@@ g_strdup_printf ("video/x-mxf-%s-%s", essence_container, essence_compression); } else if (track->parent.type == MXF_METADATA_TRACK_SOUND_ESSENCE) { -- if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent. -- descriptor[0])) ++ if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> ++ parent.descriptor[0])) mxf_ul_to_string (&MXF_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.descriptor[0])->sound_essence_compression, essence_compression); @@@ -795,8 -795,8 +795,8 @@@ g_strdup_printf ("audio/x-mxf-%s-%s", essence_container, essence_compression); } else if (track->parent.type == MXF_METADATA_TRACK_DATA_ESSENCE) { -- if (MXF_IS_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track->parent. -- descriptor[0])) ++ if (MXF_IS_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track-> ++ parent.descriptor[0])) mxf_ul_to_string (&MXF_METADATA_GENERIC_DATA_ESSENCE_DESCRIPTOR (track->parent.descriptor[0])->data_essence_coding, essence_compression); @@@ -1420,8 -1421,8 +1421,8 @@@ gst_mxf_demux_pad_set_component (GstMXF pad->current_component_index); pad->current_component = -- MXF_METADATA_SOURCE_CLIP (sequence->structural_components[pad-> -- current_component_index]); ++ MXF_METADATA_SOURCE_CLIP (sequence-> ++ structural_components[pad->current_component_index]); if (pad->current_component == NULL) { GST_ERROR_OBJECT (demux, "No such structural component"); return GST_FLOW_ERROR; @@@ -1429,8 -1430,8 +1430,8 @@@ if (!pad->current_component->source_package || !pad->current_component->source_package->top_level -- || !MXF_METADATA_GENERIC_PACKAGE (pad->current_component-> -- source_package)->tracks) { ++ || !MXF_METADATA_GENERIC_PACKAGE (pad-> ++ current_component->source_package)->tracks) { GST_ERROR_OBJECT (demux, "Invalid component"); return GST_FLOW_ERROR; } @@@ -2997,8 -2998,8 +2998,8 @@@ gst_mxf_demux_pad_set_last_stop (GstMXF for (i = 0; i < p->material_track->parent.sequence->n_structural_components; i++) { clip = -- MXF_METADATA_SOURCE_CLIP (p->material_track->parent.sequence-> -- structural_components[i]); ++ MXF_METADATA_SOURCE_CLIP (p->material_track->parent. ++ sequence->structural_components[i]); if (clip->parent.duration <= 0) break; @@@ -3076,8 -3077,8 +3077,8 @@@ gst_mxf_demux_seek_push (GstMXFDemux * if (format != GST_FORMAT_TIME) goto wrong_format; -- flush = ! !(flags & GST_SEEK_FLAG_FLUSH); -- keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT); ++ flush = !!(flags & GST_SEEK_FLAG_FLUSH); ++ keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT); /* Work on a copy until we are sure the seek succeeded. */ memcpy (&seeksegment, &demux->segment, sizeof (GstSegment)); @@@ -3209,8 -3210,8 +3210,8 @@@ gst_mxf_demux_seek_pull (GstMXFDemux * if (rate <= 0.0) goto wrong_rate; -- flush = ! !(flags & GST_SEEK_FLAG_FLUSH); -- keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT); ++ flush = !!(flags & GST_SEEK_FLAG_FLUSH); ++ keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT); if (flush) { GstEvent *e; diff --cc gst/rtpvp8/gstrtpvp8.c index 0000000,baafd1f..e27db18 mode 000000,100644..100644 --- a/gst/rtpvp8/gstrtpvp8.c +++ b/gst/rtpvp8/gstrtpvp8.c @@@ -1,0 -1,21 +1,21 @@@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #include "gstrtpvp8pay.h" + #include "gstrtpvp8depay.h" + + static gboolean -plugin_init (GstPlugin *plugin) ++plugin_init (GstPlugin * plugin) + { + gst_rtp_vp8_depay_plugin_init (plugin); + gst_rtp_vp8_pay_plugin_init (plugin); + + return TRUE; + } + + GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "rtpvp8", + "rtpvp8", + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)