mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 03:01:03 +00:00
Code Issues 1 Projects Releases Wiki Activity
11425 commits 44 branches 1509 tags 391 MiB
Commit graph

2069 commits

Author SHA1 Message Date
Peter Korsgaard
787e896bde vorbisdec: support modern Tremor versions 
Tremor changed to use standard libogg rather than its own incompatible
copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail.

Tremolo so far unfortunately hasn't been updated. Restructure
vorbisdeclib.h so the int/float logic is seperate from the ogg handling,
and only use the legacy _ogg_packet_wrapper code for Tremolo.

https://bugzilla.gnome.org/show_bug.cgi?id=668726
 2012-03-14 14:10:27 +00:00
Wim Taymans
867e635cde oggdemux: only create unknown caps once 2012-03-13 12:40:11 +01:00
Wim Taymans
25137962ad fix for caps API changes 2012-03-11 19:04:41 +01:00
Tim-Philipp Müller
0b17c3747a pango: re-port pangocairo deprecation and compiler warning fixes from 0.10 
Wasn't applied because that code is in the new private base class.
 2012-03-08 20:54:49 +00:00
Tim-Philipp Müller
c9308a73ca vorbisdec: fix up for 0.11 after merge 2012-03-08 20:49:46 +00:00
Tim-Philipp Müller
29c266ccff Merge remote-tracking branch 'origin/master' into 0.11 
Conflicts:
	common
	docs/libs/gst-plugins-base-libs.types
	ext/pango/gsttextoverlay.c
	ext/vorbis/gstvorbisdec.c
	gst/playback/gstplaysink.c
	gst/playback/gstplaysinkconvertbin.c
	sys/ximage/ximagesink.c
	sys/xvimage/xvimagesink.c
 2012-03-08 20:31:34 +00:00
Tim-Philipp Müller
1dd86b9c66 Revert "ogg: Fix handling of unset granuleshift for the skeleton parser" 
This reverts commit 7418ddd753.

This breaks the unit test and messes up preroll/seeking.
 2012-03-07 12:47:23 +00:00
Mark Nauwelaerts
600b91e878 vorbisdec: simplify tag handling using base class helper 2012-03-06 16:17:55 +01:00
Sebastian Dröge
93e7bb6759 pango: Fix 'implicit conversion from enumeration type 'GstTextOverlayLineAlign' to different enumeration type 'PangoAlignment'' compiler warning 2012-03-06 13:11:16 +01:00
Sebastian Dröge
7418ddd753 ogg: Fix handling of unset granuleshift for the skeleton parser 
And also add a helper function to properly clear/reset/free the
GstOggStream structures.
 2012-03-06 13:09:05 +01:00
Oleksij Rempel (Alexey Fisher)
0c2f2a64c5 pango: don't use deprecated pango_cairo_font_map_create_context() 
https://bugzilla.gnome.org/show_bug.cgi?id=671300
 2012-03-04 18:32:32 +00:00
Wim Taymans
e45e6bc297 theoradec: init VideoInfo before usage. 2012-03-02 17:10:26 +01:00
Wim Taymans
f9bdf436f9 theoradec: move negotiation code around 
Move the format negotiation to the bufferpool negotiation.
 2012-03-02 11:34:10 +01:00
Wim Taymans
271939d118 theoradec: move some code 
The parsing of the headers consists of negotiating the format and then setting
up the decoder so split this in two parts.
 2012-03-02 11:34:10 +01:00
Wim Taymans
f89c85485d theoradec: use the right GstVideoInfo 
Keep track if we use the cropped or uncropped dimensions in the bufferpool and
map using the right GstVideoInfo.
 2012-03-02 11:34:10 +01:00
Sebastian Dröge
84a02f9f13 Merge branch '0.11' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base into 0.11 2012-03-02 10:13:52 +01:00
Sebastian Dröge
1cbcb9281c mixer/colorbalance: Update for API changes 2012-03-02 10:00:59 +01:00
Sebastian Dröge
f7939bb43f Merge branch 'master' into 0.11 
Conflicts:
	NEWS
	RELEASE
	configure.ac
	docs/plugins/gst-plugins-base-plugins.args
	docs/plugins/gst-plugins-base-plugins.hierarchy
	docs/plugins/gst-plugins-base-plugins.interfaces
	docs/plugins/inspect/plugin-adder.xml
	docs/plugins/inspect/plugin-alsa.xml
	docs/plugins/inspect/plugin-app.xml
	docs/plugins/inspect/plugin-audioconvert.xml
	docs/plugins/inspect/plugin-audiorate.xml
	docs/plugins/inspect/plugin-audioresample.xml
	docs/plugins/inspect/plugin-audiotestsrc.xml
	docs/plugins/inspect/plugin-cdparanoia.xml
	docs/plugins/inspect/plugin-encoding.xml
	docs/plugins/inspect/plugin-ffmpegcolorspace.xml
	docs/plugins/inspect/plugin-gdp.xml
	docs/plugins/inspect/plugin-gio.xml
	docs/plugins/inspect/plugin-gnomevfs.xml
	docs/plugins/inspect/plugin-libvisual.xml
	docs/plugins/inspect/plugin-ogg.xml
	docs/plugins/inspect/plugin-pango.xml
	docs/plugins/inspect/plugin-playback.xml
	docs/plugins/inspect/plugin-subparse.xml
	docs/plugins/inspect/plugin-tcp.xml
	docs/plugins/inspect/plugin-theora.xml
	docs/plugins/inspect/plugin-typefindfunctions.xml
	docs/plugins/inspect/plugin-uridecodebin.xml
	docs/plugins/inspect/plugin-videorate.xml
	docs/plugins/inspect/plugin-videoscale.xml
	docs/plugins/inspect/plugin-videotestsrc.xml
	docs/plugins/inspect/plugin-volume.xml
	docs/plugins/inspect/plugin-vorbis.xml
	docs/plugins/inspect/plugin-ximagesink.xml
	docs/plugins/inspect/plugin-xvimagesink.xml
	gst-libs/gst/app/gstappsink.c
	gst-libs/gst/audio/mixer.c
	gst-libs/gst/audio/mixer.h
	gst-libs/gst/tag/gstxmptag.c
	gst-libs/gst/video/colorbalance.c
	gst-libs/gst/video/colorbalance.h
	gst/adder/gstadder.c
	gst/playback/gstplaybasebin.c
	gst/playback/gstplaybin2.c
	gst/playback/gstplaysink.c
	gst/videoscale/gstvideoscale.c
	tests/check/elements/videoscale.c
	tests/examples/seek/seek.c
	tests/examples/v4l/probe.c
	win32/common/_stdint.h
	win32/common/audio-enumtypes.c
	win32/common/config.h
 2012-03-02 10:00:55 +01:00
Wim Taymans
5bad1eaa24 theora: fix bufferpool negotiation 
Store the uncropped frame dimensions in the videoinfo.
Always set the caps with the dimension of the cropped output.
Don't negotiate the bufferpool multiple times.
Remove the old crop feature, we always crop now.
 2012-03-01 17:29:37 +01:00
Wim Taymans
502c12f827 update for metadata API changes 2012-02-29 17:25:10 +01:00
Wim Taymans
337cfb764a add more debug about cropping 2012-02-28 16:49:10 +01:00
Edward Hervey
59918e841f Suppress deprecation warnings in selected files, for g_value_array_* mostly 2012-02-27 14:28:15 +01:00
Wim Taymans
55076379b2 vorbisenc: chain up to parent event function 2012-02-27 12:51:08 +01:00
Alessandro Decina
9f1732fba7 Fix compiler warnings 2012-02-26 20:36:46 +01:00
Alessandro Decina
5db562f13b theoraenc: fix compiler warning 2012-02-26 20:32:05 +01:00
Wim Taymans
a7c80a9c87 vorbisdec: remove old code 2012-02-15 13:32:05 +01:00
Wim Taymans
bf476953f4 vorbis: port to new memory api 2012-02-13 18:12:01 +01:00
Wim Taymans
c3478b2da0 Merge branch 'master' into 0.11 
Conflicts:
	ext/vorbis/gstvorbisparse.c
	gst-libs/gst/video/video.c
	gst/videoscale/gstvideoscale.c
	sys/v4l/gstv4lxoverlay.c
	sys/v4l/v4l_calls.c
	sys/v4l/v4lsrc_calls.c
	tests/check/libs/video.c
 2012-02-10 15:41:06 +01:00
Wim Taymans
a75e9102c5 GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING 2012-02-08 15:17:49 +01:00
Tim-Philipp Müller
99bff2329e theoraenc: remove obsolete properties 
https://bugzilla.gnome.org/show_bug.cgi?id=669328
 2012-02-05 11:00:39 +00:00
David Schleef
19141759c1 theoraenc: Use GAP flag when possible 
Set TH_ENCCTL_SET_DUPLICATE_FLAG when we see a gap flag, to
indicate to the encoder that the current frame is a duplicate
of the previous frame.
 2012-02-04 13:41:47 -08:00
Vincent Penquerc'h
b4d6263f38 oggdemux: fix granpos interpolation violating max keyframe distance 
In case many packets fit on a page, we may not see a granpos for
a while, and granpos interpolation can wrap the 'frames since last
keyframe' part of the granpos, generating a granpos which is smaller
than what it should be.

This is fixed by detecting keyframe packets (at least for Theora),
and updating the last keyframe granpos from this.

This may still be generating potentially wrong granpos for streams
which have a Theora like granpos (keyframes, a max keyframe distance
and a count of frames since last keyframe), and which allow implicit
granules on packets. For these streams, a custom keyframe detection
routine should be plugged into their GstOggStream mapper.

https://bugzilla.gnome.org/show_bug.cgi?id=669164
 2012-02-02 13:06:29 +00:00
Vincent Penquerc'h
b647c627e4 vorbisparse: pedantically recognize undefined headers too 2012-02-01 16:46:13 +00:00
Vincent Penquerc'h
809546c324 vorbisparse: fix header detection 
It was matching non header packets.

This fixes various leaks, where buffers would be pushed onto a headers
list, but never popped.

Might also fix corruption as those buffers were dropped from the output
silently...

https://bugzilla.gnome.org/show_bug.cgi?id=669167
 2012-02-01 16:40:35 +00:00
Sebastian Dröge
2fe94cad44 vorbis: Use new audio encoder/decoder base class API for srcpad caps 2012-02-01 16:27:47 +01:00
Wim Taymans
848e107146 oggdemux: don't blindly forward all unknown events 
It causes the caps event to be send downstream and cause negotiation failures.
 2012-01-30 20:58:34 +01:00
Wim Taymans
be0cadac03 update for HEADER flag changes 2012-01-30 17:16:17 +01:00
Sebastian Dröge
ba6d096d01 vorbisenc: Properly generate the channel-mask on the sinkpad caps 2012-01-27 17:10:35 +01:00
Sebastian Dröge
76b7ff8f99 vorbisparse: Pass correct header buffer size to libvorbis and include channels/rate in the srcpad caps 2012-01-27 12:08:33 +01:00
Wim Taymans
61a53092e4 alsa: merge instead of appending structures 2012-01-26 14:28:06 +01:00
Sebastian Dröge
2e65a0f34a theoraenc: Add width/height/framerate to the srcpad caps 2012-01-26 11:02:51 +01:00
Sebastian Dröge
1f37f9f41d vorbisenc: Add samplerate and channels to the srcpad caps 2012-01-26 11:01:12 +01:00
Sebastian Dröge
b363d4a103 theoraenc: Fix encoding of non-mod-16 widths/heights 
The next higher multiple of 16 has to be passed
in the input buffers but Theora does never read
beyond the configured picture size.
 2012-01-25 18:24:07 +01:00
Sebastian Dröge
544b7a35b0 theoraparse: Remove the synchronization points property 
Is someone really using it? In that case it has to be
changed from a GValueArray property to something else.
 2012-01-25 16:44:38 +01:00
Wim Taymans
fcdc385aa1 port to new map API 2012-01-25 12:30:53 +01:00
Sebastian Dröge
68c0790817 Merge branch 'master' into 0.11 
Conflicts:
	gst-libs/gst/interfaces/propertyprobe.c
	sys/xvimage/xvimagesink.c
 2012-01-25 11:50:54 +01:00
Tim-Philipp Müller
5487cb98ef Replace deprecated GStaticMutex with GMutex 2012-01-22 22:52:28 +00:00
Wim Taymans
3d42f0f6ed port to new glib thread API 2012-01-19 11:36:17 +01:00
Tim-Philipp Müller
576bbb4fd8 Remove compatibility code cruft for old GLib versions 2012-01-18 17:22:21 +00:00
Tim-Philipp Müller
fa0464cd7a pango: port to new GLib threading API 2012-01-18 17:21:02 +00:00
Sebastian Dröge
317894d314 gio: Move to gst subdirectory 
It's a plugin without external dependencies now because we
unconditionally depend on GIO anyway.
 2012-01-18 16:21:14 +01:00
Mark Nauwelaerts
34d767c6a8 oggstream: initialize variable 
... to help out challenged compiler.
 2012-01-17 18:19:30 +01:00
Vincent Penquerc'h
8d29fe8834 alsasink: fix high sample rates being rejected 
An ALSA sink may select a different rate (as we use the _set_rate_near
API, which is not guaranteed to set the exact target rate).
The rest of the code seems to already handle this well, as output
from a 88200 Hz file seems to have the correct pitch when selecting
a 96 kHz rate.
 2012-01-16 11:46:05 +00:00
Vincent Penquerc'h
361f2b169c alsasink: fix rate match message mistaking error code for sample rate 2012-01-16 11:46:05 +00:00
Vincent Penquerc'h
e60027c795 alsasink: log API errors along with the error code and string 2012-01-16 11:46:05 +00:00
Reynaldo H. Verdejo Pinochet
87bb5dddb2 Fix wrong access to undefined struct member 
For the USE_TREMOLO case, GstVorbisDec doesn't have
a vb member. Besides, Tremolo's vorbis_dsp_synthesis()
expects a vorbis_dsp_state to be passed as first
argument. Not a vorbis_block.
 2012-01-13 14:50:49 -03:00
Reynaldo H. Verdejo Pinochet
22e6c28284 Fix TREMELO -> TREMOLO typo 2012-01-13 14:47:13 -03:00
Tim-Philipp Müller
0461ed2ada Merge remote-tracking branch 'origin/master' into 0.11 
Conflicts:
	gst-libs/gst/pbutils/gstdiscoverer-types.c
	gst-libs/gst/pbutils/gstdiscoverer.c
	tests/check/Makefile.am
 2012-01-12 23:21:17 +00:00
Vincent Penquerc'h
3fbd95d85e theoraparse: fix array leak 2012-01-12 16:24:01 +00:00
Vincent Penquerc'h
9f4b71b2a7 oggdemux: fix push mode chain leak 
When I first implemented push mode seeking, I removed the chain
freeing there as it could be used later. The current code does not
seem to do that though, so I'm restoring the previous freeing,
which plugs the leak while apparently not reintroducing use of
freed data with chained and normal files, both with gst-launch
playbin2 and Totem.
 2012-01-11 16:17:42 +00:00
Vincent Penquerc'h
83c9396850 Revert "oggmux: fix pad leak" 
This reverts commit 5df30c1b90.

I must have dreamt the Valgrind logs, reverting this reintroduces
no leak, and gets rid of the test failures it introduced :S
 2012-01-10 19:02:31 +00:00
Vincent Penquerc'h
35df9d2ad9 oggstream: fix tag list leak 2012-01-10 16:57:04 +00:00
Vincent Penquerc'h
a718b859a7 oggdemux: fix pad leak 2012-01-10 16:51:09 +00:00
Vincent Penquerc'h
ef1469fc8b oggdemux: fix hang on small truncated files 
A first hang was happening when trying to locate a page backwards,
where we'd sync forever on the same page.
With that fixed, a second hang would happen after preparing an EOS
event, but with no chain created yet to send it to, the pipeline
would stay idle forever.
An element error is now emitted for this case.
 2012-01-10 16:20:23 +00:00
Vincent Penquerc'h
5df30c1b90 oggmux: fix pad leak 2012-01-10 16:20:23 +00:00
Sebastian Dröge
dc8984d76c Merge branch 'master' into 0.11 
Conflicts:
	gst-libs/gst/app/gstappsrc.c
	gst-libs/gst/audio/multichannel.h
	gst-libs/gst/video/videooverlay.c
	gst/playback/gstplaysink.c
	gst/playback/gststreamsynchronizer.c
	tests/check/Makefile.am
	win32/common/libgstvideo.def
 2012-01-10 13:15:12 +01:00
Mark Nauwelaerts
08a6621b2d vorbisdec: use right channel variable even more 2012-01-06 16:15:45 +01:00
Wim Taymans
f8ae2a0d5b vorbisdec: use right channel variable 2012-01-05 12:32:06 +01:00
Idar Tollefsen
580b6b2b69 pango: changes includes from brackets to quotes for local files 
https://bugzilla.gnome.org/show_bug.cgi?id=667316
 2012-01-05 10:52:14 +00:00
Sebastian Dröge
40938b8a89 ogg: Update for the libgstriff API changes 
Still needs to handle the raw audio channel reordering.
 2012-01-05 10:34:25 +01:00
Sebastian Dröge
75f91ebea0 ext: Add new layout field to the raw audio caps 2012-01-05 10:34:25 +01:00
Sebastian Dröge
9c60505900 vorbis: Port to the new multichannel caps 2012-01-05 10:34:24 +01:00
Sebastian Dröge
2fc75efdce alsa: Port to the new multichannel caps 2012-01-05 10:34:20 +01:00
Edward Hervey
f562a29284 Merge remote-tracking branch 'origin/master' into 0.11 
Conflicts:
	ext/theora/gsttheoraenc.c
	gst-libs/gst/tag/gstexiftag.c
	gst/adder/gstadder.c
	gst/adder/gstadder.h
	gst/playback/gstdecodebin2.c
	gst/playback/gstsubtitleoverlay.c
	tests/check/libs/tag.c
 2011-12-30 13:21:35 +01:00
Thiago Santos
08022bddc8 oggmux: fix leak when initializing pads 
Pads are initialized twice: when requesting pads and when
initializing collectpads. Avoid double initialization by
checking if collectpads are still going to be initialized when
creating request pads.
 2011-12-28 09:45:53 -03:00
Tim-Philipp Müller
3dfdd6be9d audioringbuffer: rename GST_BUFTYPE_* to GST_AUDIO_RING_BUFFER_FORMAT_TYPE_* 
Bit unwieldy, but more appropriate. Could also be moved into
audio.h as GstAudioFormatType.
 2011-12-25 21:38:21 +00:00
Tim-Philipp Müller
4fc4aeee71 theoraenc: fix template caps creation on big endian systems 2011-12-23 22:51:59 +00:00
Wim Taymans
6aafcb3992 theoradec: improve cropping 
Only add cropping metadata when needed
Remove some used code.
 2011-12-23 16:10:53 +01:00
Tim-Philipp Müller
cab6432c68 alsasink: make work for raw audio formats by fixing template caps 2011-12-23 00:54:43 +00:00
Wim Taymans
dde5e5a248 alsa: remove more property probe stuff 2011-12-22 16:37:29 +01:00
Wim Taymans
ddc05e0ed1 propertyprobe: remove propertyprobe 
Remove the propertyprobe interface
Improve docs
 2011-12-21 11:58:53 +01:00
Oleksij Rempel (Alexey Fisher)
5f3a31f4d1 theoraenc: add "dup-on-gap" option 
This option will produce duplicate frames if we get
a frame with GAP flag. This will reduce CPU load and file size.

This option should be disabled for real time applications, because it
collects GAP frames and waits until it gets a non GAP frame to start
encoding.

v30.06.2011: make some spell changes.
v03.07.2011: add handling of EOS and discontinuous for dup-on-gap.
v19.12.2011: fix pointer dangling in theora_timefifo_free
v20.12.2010: fix timestamp bug for dup-on-gap=0

Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=627459

Signed-off-by: Oleksij Rempel (Alexey Fisher) <bug-track@fisher-privat.net>
 2011-12-20 19:43:47 +00:00
Vincent Penquerc'h
229377fb6b oggdemux: assume live stream if byte size cannot be determined 
This prevents trying to seek and failing, then ending up unable
to stream because we can't get back at the headers.
A more robust way would be to find a good place to reinject the
headers when a seek fails, but I can't seem to get this to work.
 2011-12-16 15:29:21 +00:00
Tim-Philipp Müller
fb6d09055a Merge remote-tracking branch 'origin/master' into 0.11 
Conflicts:
	ext/alsa/gstalsadeviceprobe.c
	ext/alsa/gstalsamixer.c
	ext/pango/gsttextoverlay.c
	ext/pango/gsttextoverlay.h
	gst-libs/gst/audio/gstaudiobasesink.c
	gst-libs/gst/audio/gstaudioringbuffer.c
	gst-libs/gst/audio/gstaudiosrc.c
	gst-libs/gst/video/Makefile.am
	gst-libs/gst/video/video.c
	gst/encoding/gststreamcombiner.c
	gst/encoding/gststreamsplitter.c
	gst/playback/gstplaybasebin.c
	gst/playback/gststreamsynchronizer.c
	gst/playback/gstsubtitleoverlay.c
	gst/playback/gsturidecodebin.c
	sys/xvimage/xvimagesink.c
	tests/examples/Makefile.am
	win32/common/libgstvideo.def

Video overlay composition disabled for now, needs
porting to buffer meta.
 2011-12-08 01:19:03 +00:00
Thibault Saunier
785e006de9 textoverlay: unpremultiply text image 
The GstVideoOverlayComposition only supports unpremultiplied ARGB
(for now anyway, support for pre-multiplied alpha is planned.)
 2011-12-05 15:37:04 +00:00
Thibault Saunier
cbcf1e0b46 textoverlay: Attach OverlayComposition to buffers when needed 
Add video/x-surface support in the caps
We should then attach it whenever the sink supports it, but this
is working for the time being
 2011-12-05 15:37:04 +00:00
Thibault Saunier
2a687b6dfb textoverlay: Make the text_image data a buffer 
This way we won't free data that would be attached to some buffer.
 2011-12-05 15:37:03 +00:00
Thibault Saunier
a741c0cf11 textoverlay: Sync the caps with the new supported formats 
Thanks to the use of the new video composition library, we gain support to
more colospaces and formats, let's state it.
 2011-12-05 15:37:03 +00:00
Thibault Saunier
a018c187a0 textoverlay: Make use of the new video blending utility 2011-12-05 15:37:03 +00:00
Tim-Philipp Müller
5440ae3c18 Suppress deprecation warnings in selected files, for g_static_rec_mutex_* mostly 
GStaticRecMutex is part of our API/ABI, not much we can do here
in 0.10 for most of these.
 2011-12-04 20:50:25 +00:00
Tim-Philipp Müller
4828234639 alsamixer: use GRectMutext instead of GStaticRecMutex with newer glib versions 2011-12-04 20:38:19 +00:00
Tim-Philipp Müller
9c307bccc5 alsamixer: embed static mutexes into the mixer structure 
instead of allocating them dynamically
 2011-12-04 20:21:26 +00:00
Tim-Philipp Müller
0d98aa25b8 Work around deprecated thread API in glib master 
Add private replacements for deprecated functions such as
g_mutex_new(), g_mutex_free(), g_cond_new() etc., mostly
to avoid the deprecation warnings. We'll change these
over to the new API once we depend on glib >= 2.32.

Replace g_thread_create() with g_thread_try_new().
 2011-12-04 17:16:30 +00:00
Wim Taymans
1225aa9a78 update for basesink event handler changes 2011-12-02 22:24:43 +01:00
Tim-Philipp Müller
177525f89f Merge remote-tracking branch 'origin/master' into 0.11 
Conflicts:
	gst-libs/gst/netbuffer/gstnetbuffer.c
	gst/ffmpegcolorspace/avcodec.h
	gst/ffmpegcolorspace/gstffmpegcodecmap.c
	gst/ffmpegcolorspace/imgconvert.c
	gst/ffmpegcolorspace/imgconvert_template.h
	gst/ffmpegcolorspace/mem.c
	gst/playback/README
	gst/playback/gstplaybasebin.c
	gst/playback/gstplaybasebin.h
	gst/playback/gstplaybin.c
	sys/v4l/v4lmjpegsrc_calls.c
	sys/v4l/videodev_mjpeg.h
	tests/check/elements/gnomevfssink.c
 2011-12-02 11:10:17 +00:00
Piotr Fusik
14644457b0 various: typo fixes 
Fix typos in code and docs. Fixes. #658984
 2011-12-02 12:03:27 +01:00
Tim-Philipp Müller
ec0d3566bf Merge remote-tracking branch 'origin/master' into 0.11 
Conflicts:
	ext/alsa/gstalsasrc.c
	ext/alsa/gstalsasrc.h
	gst/adder/gstadder.c
	gst/playback/gstplaybin2.c
	gst/playback/gstplaysinkconvertbin.c
	win32/common/libgstvideo.def
 2011-12-02 00:07:39 +00:00
Tim-Philipp Müller
e88e47cd24 Revert "alsasrc: Improve timestamp accuracy" 
This reverts commit 0b774e0b7c.
 2011-11-30 23:15:35 +00:00
Tim-Philipp Müller
e5ae553850 Revert "alsasrc: Fix some compilation errors" 
This reverts commit 2b84f5bd74.
 2011-11-30 23:15:22 +00:00
Tim-Philipp Müller
4cc8920db4 Revert "alsa: Remove unused but set variable" 
This reverts commit e9aed7f31c.
 2011-11-30 23:15:12 +00:00