projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
558cb82
0c4b5ed
)
Merge remote-tracking branch 'origin/master' into 0.11
author
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Sun, 26 Jun 2011 20:27:28 +0000
(21:27 +0100)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Sun, 26 Jun 2011 20:27:28 +0000
(21:27 +0100)
1
2
docs/design/design-decodebin.txt
patch
|
diff1
|
diff2
|
blob
|
history
gst-libs/gst/pbutils/encoding-target.c
patch
|
diff1
|
diff2
|
blob
|
history
tests/check/libs/navigation.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
docs/design/design-decodebin.txt
Simple merge
diff --cc
gst-libs/gst/pbutils/encoding-target.c
Simple merge
diff --cc
tests/check/libs/navigation.c
index
db64473
,
1f143a3
..
893ed0b
---
1
/
tests/check/libs/navigation.c
---
2
/
tests/check/libs/navigation.c
+++ b/
tests/check/libs/navigation.c
@@@
-92,24
-89,8
+84,8
@@@
test_element_class_init (TestElementCla
{
}
- static gboolean
- test_element_interface_supported (GstImplementsInterface * ifacE,
- GType interface_type)
- {
- if (interface_type == GST_TYPE_NAVIGATION)
- return TRUE;
-
- return FALSE;
- }
-
- static void
- gst_implements_interface_init (GstImplementsInterfaceClass * klass)
- {
- klass->supported = test_element_interface_supported;
- }
-
static void
-test_element_init (TestElement * this
, TestElementClass * klass
)
+test_element_init (TestElement * this)
{
}