projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix FSF address
[platform/upstream/gstreamer.git]
/
gst
/
playback
/
gstplaysinkconvertbin.h
diff --git
a/gst/playback/gstplaysinkconvertbin.h
b/gst/playback/gstplaysinkconvertbin.h
index
fd787d9
..
1e452b2
100644
(file)
--- a/
gst/playback/gstplaysinkconvertbin.h
+++ b/
gst/playback/gstplaysinkconvertbin.h
@@
-14,8
+14,8
@@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * Free Software Foundation, Inc., 5
1 Franklin St, Fifth Floor
,
+ * Boston, MA 0211
0-1301
, USA.
*/
#include <gst/gst.h>
*/
#include <gst/gst.h>
@@
-41,7
+41,7
@@
G_BEGIN_DECLS
GST_LOG_OBJECT (obj, \
"locking from thread %p", \
g_thread_self ()); \
GST_LOG_OBJECT (obj, \
"locking from thread %p", \
g_thread_self ()); \
- g_mutex_lock (GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock); \
+ g_mutex_lock (
&
GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock); \
GST_LOG_OBJECT (obj, \
"locked from thread %p", \
g_thread_self ()); \
GST_LOG_OBJECT (obj, \
"locked from thread %p", \
g_thread_self ()); \
@@
-51,7
+51,7
@@
G_BEGIN_DECLS
GST_LOG_OBJECT (obj, \
"unlocking from thread %p", \
g_thread_self ()); \
GST_LOG_OBJECT (obj, \
"unlocking from thread %p", \
g_thread_self ()); \
- g_mutex_unlock (GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock); \
+ g_mutex_unlock (
&
GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock); \
} G_STMT_END
typedef struct _GstPlaySinkConvertBin GstPlaySinkConvertBin;
} G_STMT_END
typedef struct _GstPlaySinkConvertBin GstPlaySinkConvertBin;
@@
-62,7
+62,7
@@
struct _GstPlaySinkConvertBin
GstBin parent;
/* < private > */
GstBin parent;
/* < private > */
- GMutex
*
lock;
+ GMutex lock;
GstPad *sinkpad, *sink_proxypad;
guint sink_proxypad_block_id;
GstPad *sinkpad, *sink_proxypad;
guint sink_proxypad_block_id;