diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-11-26 13:34:10 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-11-26 13:34:10 +0000 |
| commit | be0d6baac5960546ce7e3d812734481580078f9e (patch) | |
| tree | 28afa7224232fbe31d8c6e4bb7c564bb0d5d977f /gst/effectv/gstquark.c | |
| parent | a806ae2edddb0dd3fb82fda6fd2078c5fa2acab1 (diff) | |
| parent | a3bc43192477baf4a8a0510fd55a762a408955c0 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesrc.c
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstamrparse.c
gst/audioparsers/gstdcaparse.c
gst/audioparsers/gstflacparse.c
gst/effectv/gstradioac.c
gst/effectv/gstradioac.h
gst/effectv/gstripple.c
Some possible FIXMEs remaining in the audio parser getcaps functions.
Diffstat (limited to 'gst/effectv/gstquark.c')
| -rw-r--r-- | gst/effectv/gstquark.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c index 1c4434757..4ae7ecb19 100644 --- a/gst/effectv/gstquark.c +++ b/gst/effectv/gstquark.c @@ -328,7 +328,4 @@ gst_quarktv_init (GstQuarkTV * filter) { filter->planes = PLANES; filter->current_plane = filter->planes - 1; - - gst_pad_use_fixed_caps (GST_BASE_TRANSFORM_SRC_PAD (filter)); - gst_pad_use_fixed_caps (GST_BASE_TRANSFORM_SINK_PAD (filter)); } |