mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-07 15:15:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/gstpad.h
This commit is contained in:
Wim Taymans 2011-05-24 09:48:44 +02:00
parent 32ea413a40 696a9a694f
commit 483c0fe490
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/gstclock.h
View file

@ -205,15 +205,22 @@ G_STMT_START { \
/** /**
* GST_TIME_FORMAT: * GST_TIME_FORMAT:
* *
* A format that can be used in printf like format strings to format * A string that can be used in printf-like format strings to display a
* a #GstClockTime value. * #GstClockTime value in h:m:s format. Use GST_TIME_ARGS() to construct
* the matching arguments.
*
* Example:
* |[
* printf("%" GST_TIME_FORMAT "\n", GST_TIME_ARGS(ts));
* ]|
*/ */
#define GST_TIME_FORMAT "u:%02u:%02u.%09u" #define GST_TIME_FORMAT "u:%02u:%02u.%09u"
/** /**
* GST_TIME_ARGS: * GST_TIME_ARGS:
* @t: a #GstClockTime * @t: a #GstClockTime
* *
* Format @t for the GST_TIME_FORMAT format string. * Format @t for the #GST_TIME_FORMAT format string. Note: @t will be
* evaluated more than once.
*/ */
#define GST_TIME_ARGS(t) \ #define GST_TIME_ARGS(t) \
GST_CLOCK_TIME_IS_VALID (t) ? \ GST_CLOCK_TIME_IS_VALID (t) ? \