diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-07-22 14:02:16 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-07-22 14:02:16 -0400 |
| commit | ef6dbf9be87af7a91a50a910f8578ce3de75846c (patch) | |
| tree | ef2ba06906d155c8dee835bdaafa06d09628e8bc /ext/metadata/gstbasemetadata.c | |
| parent | ba89c9e518ded3d919461903a444799a5115c34f (diff) | |
| parent | 87a97e24d4b4e63dc2fa3a3a12f9b30bfbe54368 (diff) | |
| download | gst-plugins-bad-ef6dbf9be87af7a91a50a910f8578ce3de75846c.tar.gz gst-plugins-bad-ef6dbf9be87af7a91a50a910f8578ce3de75846c.tar.bz2 gst-plugins-bad-ef6dbf9be87af7a91a50a910f8578ce3de75846c.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/metadata/gstbasemetadata.c')
| -rw-r--r-- | ext/metadata/gstbasemetadata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/metadata/gstbasemetadata.c b/ext/metadata/gstbasemetadata.c index 4609013b..dd91b2aa 100644 --- a/ext/metadata/gstbasemetadata.c +++ b/ext/metadata/gstbasemetadata.c @@ -1151,8 +1151,8 @@ gst_base_metadata_calculate_offsets (GstBaseMetadata * base) goto done; } - metadata_chunk_array_remove_zero_size (&META_DATA_INJECT_CHUNKS (base-> - metadata)); + metadata_chunk_array_remove_zero_size (&META_DATA_INJECT_CHUNKS + (base->metadata)); metadata_lazy_update (base->metadata); @@ -1420,7 +1420,7 @@ gst_base_metadata_change_state (GstElement * element, GstStateChange transition) switch (transition) { case GST_STATE_CHANGE_PAUSED_TO_READY: gst_base_metadata_reset_streaming (filter); - if (filter->state != MT_STATE_PARSED) + if (filter->state == MT_STATE_PARSED) gst_base_metadata_reset_parsing (filter); break; default: |