summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <jan.schmidt@sun.com>2009-10-08 00:17:21 +0100
committerJan Schmidt <jan.schmidt@sun.com>2009-10-08 00:17:21 +0100
commit592b8ecb09ace5176ea179826aacff088d1de85e (patch)
tree099d4603fb636463f0d1411c64b6bde4dc576683
parent9bd6fe41cbb95f8edb56b0a5d3cf52758c96942e (diff)
decodebin2: Fix type-punning warning
-rw-r--r--gst/playback/gstdecodebin2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 60dbf57cb..f65453854 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -2131,7 +2131,7 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
it = gst_pad_iterate_internal_links (sinkpad);
- if (!it || (gst_iterator_next (it, (gpointer *) & srcpad)) != GST_ITERATOR_OK
+ if (!it || (gst_iterator_next (it, (gpointer) & srcpad)) != GST_ITERATOR_OK
|| srcpad == NULL) {
GST_ERROR_OBJECT (dbin,
"Couldn't get srcpad from multiqueue for sinkpad %" GST_PTR_FORMAT,
@@ -2267,9 +2267,8 @@ gst_decode_chain_handle_eos (GstDecodeChain * eos_chain)
break;
}
- drained =
- chain->active_group ? gst_decode_group_is_drained (chain->
- active_group) : TRUE;
+ drained = chain->active_group ?
+ gst_decode_group_is_drained (chain->active_group) : TRUE;
/* Now either group == NULL and chain == dbin->decode_chain
* or chain is the lowest chain that has a non-drained group */