projects
/
platform
/
upstream
/
gst-plugins-good.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/0.10'
[platform/upstream/gst-plugins-good.git]
/
gst
/
shapewipe
/
gstshapewipe.h
diff --git
a/gst/shapewipe/gstshapewipe.h
b/gst/shapewipe/gstshapewipe.h
index
860f3f4
..
1df8c5e
100644
(file)
--- a/
gst/shapewipe/gstshapewipe.h
+++ b/
gst/shapewipe/gstshapewipe.h
@@
-59,7
+59,8
@@
struct _GstShapeWipe
GCond mask_cond;
gint mask_bpp;
- GstVideoInfo info;
+ GstVideoInfo vinfo;
+ GstVideoInfo minfo;
gboolean shutdown;