projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 0.11
[platform/upstream/gstreamer.git]
/
gst-libs
/
gst
/
pbutils
/
pbutils-private.h
diff --git
a/gst-libs/gst/pbutils/pbutils-private.h
b/gst-libs/gst/pbutils/pbutils-private.h
index
2efaa17
..
8ac6147
100644
(file)
--- a/
gst-libs/gst/pbutils/pbutils-private.h
+++ b/
gst-libs/gst/pbutils/pbutils-private.h
@@
-19,7
+19,7
@@
*/
struct _GstDiscovererStreamInfo {
*/
struct _GstDiscovererStreamInfo {
- G
stMiniObject
parent;
+ G
Object
parent;
GstDiscovererStreamInfo *previous; /* NULL for starting points */
GstDiscovererStreamInfo *next; /* NULL for containers */
GstDiscovererStreamInfo *previous; /* NULL for starting points */
GstDiscovererStreamInfo *next; /* NULL for containers */
@@
-73,7
+73,7
@@
struct _GstDiscovererSubtitleInfo {
};
struct _GstDiscovererInfo {
};
struct _GstDiscovererInfo {
- G
stMini
Object parent;
+ GObject parent;
gchar *uri;
GstDiscovererResult result;
gchar *uri;
GstDiscovererResult result;