projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5002ea
)
audiomixer: remove now-unused base_time field in object structure
author
Tim-Philipp Müller
<tim@centricular.com>
Thu, 5 Feb 2015 15:57:59 +0000
(15:57 +0000)
committer
Tim-Philipp Müller
<tim@centricular.com>
Fri, 6 Feb 2015 10:47:20 +0000
(10:47 +0000)
gst/audiomixer/gstaudiomixer.h
patch
|
blob
|
history
diff --git
a/gst/audiomixer/gstaudiomixer.h
b/gst/audiomixer/gstaudiomixer.h
index
f626d78
..
9e14582
100644
(file)
--- a/
gst/audiomixer/gstaudiomixer.h
+++ b/
gst/audiomixer/gstaudiomixer.h
@@
-49,7
+49,7
@@
typedef struct _GstAudioMixerPadClass GstAudioMixerPadClass;
* The audiomixer object structure.
*/
struct _GstAudioMixer {
- GstAggregator
element
;
+ GstAggregator
aggregator
;
/* the next are valid for both int and float */
GstAudioInfo info;
@@
-69,8
+69,6
@@
struct _GstAudioMixer {
GstClockTime alignment_threshold;
GstClockTime discont_wait;
- gint64 base_time;
-
/* Duration of every output buffer */
GstClockTime output_buffer_duration;
};