Commit graph

5873 commits

Author SHA1 Message Date
Alessandro Decina
583342271f goom2k1: fix compiler warning 2012-02-26 20:39:52 +01:00
Alessandro Decina
6e96f4c201 mpegaudioparse: fix compiler warning 2012-02-26 20:30:24 +01:00
Tim-Philipp Müller
676b371bdb qtmux: create streamable output if downstream is not seekable
Ignore the "streamable" property setting and create streamable
output if downstream is known not to be seekable (as queried
via a SEEKABLE query).

Fixes pipelines like qtmux ! appsink possibly creating seemingly
corrupted output if streamable has not been set to true.
2012-02-25 15:57:02 +00:00
Tim-Philipp Müller
6b0dd47586 flvmux: create streamable output if downstream is not seekable
Ignore the "streamable" property setting and create streamable
output if downstream is known not to be seekable (as queried
via a SEEKABLE query).

Fixes pipelines like flvmux ! appsink possibly creating seemingly
corrupted output if streamable has not been set to true.
2012-02-25 15:56:51 +00:00
Tim-Philipp Müller
f4afccff5c matroskamux: create streamable output if downstream is not seekable
Ignore the "streamable" property setting and create streamable
output if downstream is known not to be seekable (as queried
via a SEEKABLE query).

Fixes pipelines like webmmux ! appsink creating seemingly
corrupted output if streamable has not been set to true.
2012-02-25 15:56:30 +00:00
Wim Taymans
44828add73 update for basetransform change 2012-02-24 11:03:48 +01:00
David Schleef
c6dafad169 efence: remove plugin
Valgrind is much more useful these days.
2012-02-23 08:42:25 -08:00
Wim Taymans
3c292543bc audiofx: remove transform lock usage 2012-02-23 12:03:24 +01:00
Wim Taymans
7749cd3f7b update for basetransform lock removal 2012-02-23 11:20:02 +01:00
Tim-Philipp Müller
c762e945be debugutils: disable efence plugin properly
We don't want it built if mmap isn't available either..
2012-02-22 23:36:54 +00:00
Wim Taymans
ca9532ccc5 update for new memory api 2012-02-22 02:10:33 +01:00
Mark Nauwelaerts
0d5b5d839a mpegaudioparse: support parsing freeform bitrate stream 2012-02-21 18:43:02 +01:00
Mark Nauwelaerts
8530c0f620 monoscope: port to 0.11 2012-02-21 18:39:18 +01:00
Olivier Crête
18899cf94d rtph264pay: Force baseline is profile-level-id is unspecified 2012-02-21 10:51:43 +01:00
Olivier Crête
1fe69911a4 rtph264pay: Force baseline is profile-level-id is unspecified 2012-02-20 14:30:55 -05:00
Wim Taymans
41406037ac fix compiler warnings 2012-02-20 16:35:47 +01:00
Matej Knopp
d7695bb67d fix compiler warnings 2012-02-20 16:32:34 +01:00
Peteris Krisjanis
d44b3fd8ec level: use GValueArray instead of GstValueList in messages
Updated GstLevel element to use GValueArray instead of
GstValueList for rms/peak/decay keys attached to element
message.

https://bugzilla.gnome.org/show_bug.cgi?id=670303
2012-02-18 11:37:41 +00:00
Wim Taymans
82a43ad1ab Merge branch 'master' into 0.11
Conflicts:
	gst/equalizer/gstiirequalizer.c
2012-02-17 23:49:21 +01:00
Tim-Philipp Müller
f76f7374ea equalizer: fix switching from passthrough to non-passthrough when parameters change
commit b5bf0294 moved the if(need_new_coefficients) set_passthrough(equ)
after the if(is_passthrough) return FLOW_OK shortcut, so the passthrough
mode would never get updated even if the coefficients change.

Fixes equalizer-test doing .. nothing.
2012-02-17 18:35:54 +00:00
Mark Nauwelaerts
fdfe4ed445 goom*: fix leaked caps event 2012-02-17 17:57:03 +01:00
Mark Nauwelaerts
5cb42081a5 mpegaudioparse: parse either Xing or VBRI data
... and avoid confusing debug message claiming neither present.
2012-02-17 17:34:53 +01:00
Wim Taymans
e71c7dc8f9 matrosk: fix segment update 2012-02-17 14:38:03 +01:00
Mark Nauwelaerts
3ce9836a59 goom: fix buffer leak 2012-02-16 23:46:45 +01:00
Mark Nauwelaerts
abc30b7e46 goom2k1: use some more boilerplate 2012-02-16 23:46:45 +01:00
Mark Nauwelaerts
858468b9b1 goom2k1: port to 0.11 2012-02-16 23:35:11 +01:00
Philippe Normand
4945af5eff interleave: port to 0.11
Port of the interleave element and its unittests.

https://bugzilla.gnome.org/show_bug.cgi?id=669643
2012-02-16 14:40:59 +00:00
Tim-Philipp Müller
979431c034 rtpjitterbuffer: declare variables at the beginning of the block
It's how we roll. Fixes 'ISO C90 forbids mixed declarations and code'
compiler warning.
2012-02-16 11:21:28 +00:00
Wim Taymans
6b2998d5b7 aacparse: remove some unused declarations 2012-02-15 12:41:43 +01:00
Wim Taymans
4f4f9c9c68 aspectratiocrop: fix caps refcount 2012-02-14 12:26:37 +01:00
Mark Nauwelaerts
1ae32656ae audioparsers: adjust to modified baseparse API 2012-02-13 18:27:53 +01:00
Wim Taymans
e3b5a2e40d update for memory api change 2012-02-13 18:13:19 +01:00
Wim Taymans
225e98d623 Merge branch 'master' into 0.11
Conflicts:
	ext/flac/gstflacenc.c
	ext/jack/gstjackaudioclient.c
	ext/jack/gstjackaudiosink.c
	ext/jack/gstjackaudiosrc.c
	ext/pulse/plugin.c
	ext/shout2/gstshout2.c
	gst/matroska/matroska-mux.c
	gst/rtp/gstrtph264pay.c
2012-02-10 16:23:14 +01:00
Tim-Philipp Müller
5b25f3737b rtph264pay: add stream-format and alignment to h264 sink caps
We're happy to accept both byte-stream and avc, advertise
that on the sink caps and fix up _get_caps() function to
not just return "video/x-h264".

https://bugzilla.gnome.org/show_bug.cgi?id=606662
2012-02-10 14:08:55 +00:00
Tim-Philipp Müller
6872b40873 rtph264depay: add stream-format and alignment fields to src template caps
Because we can. And so we get a warning if we try to output avc with
nal alignment or somesuch.

https://bugzilla.gnome.org/show_bug.cgi?id=606662
2012-02-10 14:08:55 +00:00
Wim Taymans
8eca20ead0 flv: use default pad query
We need to chain up unknown queries to the default query handler instead of
blindly forwarding them. In this case it caused the caps query to be forwarded
to the upstream typefind and return the wrong type for the audio/video pad.
2012-02-10 10:07:34 +01:00
Mark Nauwelaerts
207f520bbd aacparse: correctly set ADIF src caps 2012-02-09 22:10:11 +01:00
Mark Nauwelaerts
ee2e07d50d ac3parse: prevent a few direct exits without cleanup 2012-02-09 22:10:07 +01:00
Marc Leeman
dc54c83fd3 multiudpsink: typo fix (bytes send -> bytes sent) 2012-02-09 10:26:42 +01:00
Wim Taymans
9365f12d6e GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING 2012-02-08 16:43:30 +01:00
Philippe Normand
640be49e21 deinterleave: port to 0.11
Port of the deinterleave element and its unittests. The interleave
element will be ported as part of another patch, hence disabling it
for now.

https://bugzilla.gnome.org/show_bug.cgi?id=668847
2012-02-08 10:40:39 +01:00
Wim Taymans
54252d0c49 effecttv: fix initialisation 2012-02-07 10:30:28 +01:00
Wim Taymans
9196e0a3d6 y4m: fix negotiation 2012-02-07 10:30:28 +01:00
Wim Taymans
6674b029e4 flv: fix caps 2012-02-06 15:52:36 +01:00
Wim Taymans
dd26b14930 iirequalizer: fix equalizer and unit test 2012-02-06 15:20:55 +01:00
Wim Taymans
408873a884 avimux: take the pad from collectpads2 correctly 2012-02-06 13:43:49 +01:00
Wim Taymans
44d369211c audiodynamic: fix negotiation 2012-02-06 13:28:55 +01:00
Nicola Murino
32f8a04b57 matroskademux: avoid posting invalid duration for each frame
https://bugzilla.gnome.org/show_bug.cgi?id=666583
2012-02-06 10:23:51 +00:00
Wim Taymans
ed8c0b7f63 jitterbuffer: fix caps after pt change 2012-02-06 09:23:07 +01:00
Wim Taymans
c94c06530e jitterbuffer: fix caps leak 2012-02-06 09:18:17 +01:00
Wim Taymans
3a095a26b2 aacparse: fix srcpad caps handling 2012-02-03 16:14:08 +01:00
Vincent Penquerc'h
5e93d1ce4c flvmux: specify we only accept raw AAC in template caps
No header seems to be added, and the codec ID is the same as used
for raw by flvdemux, so raw seems the only supported case.

https://bugzilla.gnome.org/show_bug.cgi?id=665394
2012-02-02 12:36:30 +00:00
Vincent Penquerc'h
57a0eacc7b flvdemux: specify we only output raw AAC in template caps
https://bugzilla.gnome.org/show_bug.cgi?id=665394
2012-02-02 12:36:30 +00:00
Tim-Philipp Müller
0f3b7b010e build: ignore GValueArray deprecation warnings for the time being
until this gets sorted out with the GLib folks and we have a
viable alternative.

https://bugzilla.gnome.org/show_bug.cgi?id=667228
2012-02-01 16:40:51 +00:00
Vincent Penquerc'h
d651baf05a rtpmp2tpay: do not try to flush a packet when no data is available
https://bugzilla.gnome.org/show_bug.cgi?id=668874
2012-01-31 13:12:47 +00:00
Wim Taymans
bb2bd604e0 update for HEADER flag 2012-01-30 17:16:51 +01:00
Pascal Buhler
c16fed2ad9 rtph264depay: Exclude NALu size from payload length on truncated packets.
https://bugzilla.gnome.org/show_bug.cgi?id=667846
2012-01-30 15:49:07 +00:00
Vincent Penquerc'h
70565f0e75 matroskamux: remove obsolete variable, set but not used
Reported by andredieb on #gstreamer.
2012-01-28 23:35:50 +00:00
Vincent Penquerc'h
e967e27c36 videobox: avoid wrapping opaque to transparent 2012-01-28 13:05:09 +00:00
Vincent Penquerc'h
119f94bab7 matroskamux: do not free memory twice
A recent change to fix leaking codec ID string accidentally caused
one of the very few places that weren't leaking to now free twice.
2012-01-28 12:35:13 +00:00
Olivier Crête
a7c27e1aaa alawdec: Each output sample is 2 bytes 2012-01-27 19:05:24 +01:00
Olivier Crête
87f2088303 rtpjitterbuffer: Don't leak caps event when not pushing 2012-01-27 19:05:24 +01:00
Olivier Crête
33a6d1921f rtpptdemux: Forward sticky events 2012-01-27 19:05:24 +01:00
Olivier Crête
7b1f8cb8f0 rtpptdemux: Protect all uses pad list with OBJECT LOCK
Actually protect the entire pad list and use it in a thread safe
way.
2012-01-27 19:05:24 +01:00
Olivier Crête
b3f5cdd1f9 rtpssrcdemux: Forward sticky events to new pads 2012-01-27 19:05:24 +01:00
Olivier Crête
76c93af537 rtpssrcdemux: Add ssrc to forwarded CAPS events
Also iterate the list of GstRtpSsrcDemuxPad safely
2012-01-27 19:05:23 +01:00
Olivier Crête
3285c45dbc rtpssrccdemux: Factor out getting dpad by pad 2012-01-27 19:05:23 +01:00
Olivier Crête
b850741430 rtpsession: Keep the buffer mapped while it is being modified 2012-01-27 19:05:23 +01:00
Olivier Crête
aeec2d5f7e rtpsession: Initialise the address pointer to NULL 2012-01-27 19:05:23 +01:00
Wim Taymans
9095f455d5 videomixer2: remove pad event function
We use the one from collectpads
2012-01-26 19:49:14 +01:00
Vincent Penquerc'h
4d73fe793a Revert "qtdemux: fix GstDateTime/GDateTime mixup"
This reverts commit 5326126112.

The GstDateTime->GDateTime change in core was apparently accidental,
and is now reverted.
2012-01-26 18:26:02 +00:00
Vincent Penquerc'h
714e556ef1 Revert "avidemux: fix GstDateTime/GDateTime mixup"
This reverts commit acc9f15096.

The GstDateTime->GDateTime change in core was apparently accidental,
and is now reverted.
2012-01-26 18:25:21 +00:00
Vincent Penquerc'h
acc9f15096 avidemux: fix GstDateTime/GDateTime mixup
This is a blind fix to match the one I just made to qtdemux,
as I do not have an AVI file where the code gets executed.
2012-01-26 17:52:30 +00:00
Vincent Penquerc'h
5326126112 qtdemux: fix GstDateTime/GDateTime mixup 2012-01-26 17:52:30 +00:00
Wim Taymans
33ae3fe047 videomixer: more fixes 2012-01-26 18:51:30 +01:00
Wim Taymans
85a96b3703 videomixer: make videomixer work somewhat 2012-01-26 18:43:06 +01:00
Wim Taymans
df260a2ec6 videomixer: port to 0.11
It builds and gst-inspect-0.11 works.. otherwise untested
2012-01-26 18:16:58 +01:00
Tim-Philipp Müller
bd032ae3bf dynudpsink: fix get-stats signal registration some more 2012-01-26 15:48:01 +00:00
Tim-Philipp Müller
1b9642b9f1 Revert "udp: mark action signals as RUN_FIRST"
This reverts commit 5c83085991.
2012-01-26 15:46:13 +00:00
Tim-Philipp Müller
5c83085991 udp: mark action signals as RUN_FIRST 2012-01-26 15:43:11 +00:00
Tim-Philipp Müller
8bc7e4f37f udp: mark "get-stats" as action signal 2012-01-26 15:43:11 +00:00
Tim-Philipp Müller
80f319b7da udp: fix get-stats action signal registration
It returns a GstStructure now, not a GValueArray
2012-01-26 15:43:11 +00:00
Andoni Morales Alastruey
bb7b879545 udpsrc: fix print format 2012-01-26 16:31:24 +01:00
Sebastian Dröge
cea52c0fde matroskamux: Fix size of output buffers 2012-01-26 11:50:47 +01:00
Wim Taymans
2cc2ada2e4 qtmux: include right collectpads version 2012-01-26 11:43:44 +01:00
Sebastian Dröge
57fb67eb59 matroskademux: Properly use the alignment parameter of gst_buffer_new_allocate()
It's a bitmask for the alignment, not the alignment itself.
2012-01-26 11:29:11 +01:00
Sebastian Dröge
1f05fbf411 matroskamux: Properly unmap WRITE maps of the output buffers 2012-01-26 11:18:40 +01:00
Sebastian Dröge
d45d3ac721 videomixer2: Update for the new collectpads2 event handling API 2012-01-26 10:44:28 +01:00
Sebastian Dröge
30689a8167 qtmux: Update for the new collectpads2 event handling API 2012-01-26 10:40:06 +01:00
Sebastian Dröge
a54c4d6bc4 matroskamux: Update for the new collectpads2 event handling API 2012-01-26 10:38:27 +01:00
Sebastian Dröge
76a22a6ebb flvmux: Update for new collectpads2 event handling API 2012-01-26 10:34:34 +01:00
Sebastian Dröge
934cd01480 avimux: Update for new collectpads2 event handling API 2012-01-26 10:34:30 +01:00
Sebastian Dröge
6d97ac2996 matroskamux: Only forward the event when we didn't handle it ourselves 2012-01-25 18:42:07 +01:00
Wim Taymans
8331bd7e10 videomixer: some more porting 2012-01-25 18:40:03 +01:00
Wim Taymans
3f1bccbb17 videomixer: port blend function 2012-01-25 18:02:13 +01:00
Edward Hervey
03b9966bc0 flv: Fix unitialized variables
(or rather circumvent issues with naive compilers ...)
2012-01-25 16:58:12 +01:00
Tim-Philipp Müller
5525e40970 rtpmanager: don't pretend our random hostnames are fully-qualified domain names 2012-01-25 13:19:12 +00:00
Sebastian Dröge
0b517ce9fb Merge branch '0.11' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good into 0.11 2012-01-25 12:49:34 +01:00
Sebastian Dröge
10554b271f Merge branch 'master' into 0.11
Conflicts:
	ext/flac/gstflacdec.c
	ext/jpeg/gstjpegenc.c
	ext/pulse/pulsesink.c
	sys/v4l2/gstv4l2src.c
2012-01-25 12:49:11 +01:00
Wim Taymans
684f504336 matroska: port to new memory API 2012-01-25 12:41:30 +01:00
Wim Taymans
b4630dd3e0 more memory API porting 2012-01-25 12:30:29 +01:00
Wim Taymans
583d39dd8d update for new memory API 2012-01-25 12:30:28 +01:00
Vincent Penquerc'h
6429359d55 udpsrc: fix string leak 2012-01-24 14:53:38 +00:00
Vincent Penquerc'h
73754081e5 udpsrc: fix use of freed memory 2012-01-24 14:52:09 +00:00
Matej Knopp
b780639b2c Don't crash on empty laces
https://bugzilla.gnome.org/show_bug.cgi?id=665224
2012-01-24 14:09:48 +00:00
Tim-Philipp Müller
a476d529d2 rtpmanager: don't reveal the user's username, hostname or real name by default
Send a randomly made-up user@hostname as CNAME and don't
send a NAME at all by default.

https://bugzilla.gnome.org/show_bug.cgi?id=668320
2012-01-23 13:47:08 +00:00
Tim-Philipp Müller
37409d4d65 Don't use deprecated GLib API 2012-01-22 23:32:51 +00:00
Tim-Philipp Müller
7cb9b7ab9d Use new GLib API unconditionally 2012-01-22 23:15:19 +00:00
Mark Nauwelaerts
a224ffb971 rtspsrc: simplify internal src event debug logging
... which avoids almost superfluous obtaining of rtsp element.
2012-01-20 17:10:57 +01:00
Mark Nauwelaerts
018852ddc2 rtspsrc: avoid NULL string comparison 2012-01-20 17:10:54 +01:00
Mark Nauwelaerts
eff88a239f rtpbin: arrange for initialized variables 2012-01-20 17:10:51 +01:00
Mark Nauwelaerts
a3ea25bc88 rtpmp4adepay: prevent out-of-bound array access 2012-01-20 17:10:48 +01:00
Mark Nauwelaerts
3137f26544 isomp4: recovery: add sanity check
... on possibly bogus/corrupt input data.
2012-01-20 17:10:44 +01:00
Mark Nauwelaerts
ed94e01231 rtptheoradepay: remove dead code 2012-01-20 17:10:40 +01:00
Mark Nauwelaerts
c588d568f1 matroska-demux: remove redundant variable 2012-01-20 17:10:37 +01:00
Mark Nauwelaerts
9d771c9bed deinterlace: fix arithmetic for unsigned comparison 2012-01-20 17:10:33 +01:00
Mark Nauwelaerts
a973c0b381 imagefreeze: add various missing break 2012-01-20 17:10:30 +01:00
Mark Nauwelaerts
436a85ac8a avidemux: tweak DEFAULT format duration query response 2012-01-20 17:10:25 +01:00
Mark Nauwelaerts
14fe651b15 alphacolor: remove redundant statement 2012-01-20 17:10:21 +01:00
Wim Taymans
b22c0dd3f6 update for memory API 2012-01-19 12:44:39 +01:00
Wim Taymans
1584806634 port to new gthread API 2012-01-19 11:33:53 +01:00
Sebastian Dröge
2eeb0eb58e udpsrc: Remove unneeded socket.h include 2012-01-17 16:58:07 +01:00
Sebastian Dröge
59e08fa503 configure: Remove socket/winsock specific checks
Not necessary anymore.
2012-01-17 16:53:31 +01:00
Sebastian Dröge
305901c7cc rtspsrc: Update for the new GIO versions of the udp elements 2012-01-17 16:49:10 +01:00
Sebastian Dröge
cb789e32ad rtpmanager: Port to GIO 2012-01-17 13:08:42 +01:00
Sebastian Dröge
a3496b14ea configure: Require GIO 2.31.10 2012-01-17 11:21:25 +01:00
Sebastian Dröge
2ea3ef0c1c udp: Remove now unecessary code 2012-01-17 11:18:33 +01:00
Sebastian Dröge
bb38a849e5 udpsink/multiudpsink: Port to GIO 2012-01-17 11:18:15 +01:00
Sebastian Dröge
6f055d554b dynudpsink: Port to GIO 2012-01-17 10:49:34 +01:00
Sebastian Dröge
7f0239b19b dynudpsink: Port to GIO 2012-01-17 09:32:27 +01:00
Sebastian Dröge
7f74fc9ef6 udpsrc: Port to GIO 2012-01-17 09:07:40 +01:00
Vincent Penquerc'h
cf81df8058 cutter: fix leak of unused GValue 2012-01-16 17:51:18 +00:00
Vincent Penquerc'h
2a7a38ca07 rtph263ppay: fix caps leak 2012-01-16 15:42:46 +00:00
Vincent Penquerc'h
4d51c68fc0 deinterlace: make interlacedness test deterministic
If the interlaced flag is not present in the caps, we assume the
data is not interlaced, instead of leaving the boolean uninitialized.
2012-01-16 12:13:50 +00:00
Matej Knopp
d55f75f6f4 matroska: fix printf format compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=662615
2012-01-15 18:31:27 +00:00
Mark Nauwelaerts
7002edbe2b matroskademux: clean up obsolete closing segment handling 2012-01-13 14:24:40 +01:00
Tim-Philipp Müller
f10e8192fa rtpptdemux: plug pad leak in error code path
Based on patch by: Stig Sandnes <stig.sandnes@cisco.com>

Don't leak srcpad if there are no caps.

https://bugzilla.gnome.org/show_bug.cgi?id=667820
2012-01-13 11:02:24 +00:00
Tim-Philipp Müller
d681af899b GST_TYPE_DATE -> G_TYPE_DATE 2012-01-12 23:55:31 +00:00
Tim-Philipp Müller
8580dd86c9 eqMerge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/jack/gstjackaudiosink.c
	ext/jack/gstjackaudiosrc.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-read-common.c
	gst/rtpmanager/gstrtpssrcdemux.c
2012-01-12 23:48:50 +00:00
Vincent Penquerc'h
654a04f90c gstrtpssrcdemux: fix element leak 2012-01-12 18:23:42 +00:00
Vincent Penquerc'h
f04d812719 matroska: do not leak attachment buffers 2012-01-12 14:19:22 +00:00
Mark Nauwelaerts
e8c254f34d flvdemux: remove obsolete FIXME comments 2012-01-12 13:18:43 +01:00
Mark Nauwelaerts
559c800c4f flvdemux: add prefix to local GstIndex related copies
... to avoid duplicate type names with other such local copies in the wild.
2012-01-12 11:09:07 +01:00
Mark Nauwelaerts
68e0d2b60c flvdemux: activate pad before setting caps
... rather than the usual 0.10 other way around.

Fixes #667558.
2012-01-12 11:09:07 +01:00
Leo Singer
56353e24d2 audiofx: Use most common convention for definitions of IIR filter coefficients.
Most signal processing texts, including MATLAB, use the following convention for IIR filter coefficients:

a_0 y[n] + a_1 y[n-1] + ... + a_M y[n-M] = b_0 x[n] + b_1 x[n-1] + ... + b[N] x[n-N]

Usually, a_0 is set to 1 because the coefficients can always be rescaled, giving

y[n] = b_0 x[n] + b_1 x[n-1] + ... + b[N] x[n-N] - a_1 y[n-1] - ... - a_M y[n-M]

The convention that was previously used by audiofxbaseiirfilter and derived class had the a and b coefficients swapped, and did not have the minus signs.

This change makes the audiofx plugin use the more common convention described above.
2012-01-11 15:24:00 +01:00
Nicola Murino
d1bb060d71 matroskamux: fix codec_priv leaks
https://bugzilla.gnome.org/show_bug.cgi?id=667419
2012-01-10 18:29:06 +00:00
Sebastian Dröge
93e3ed5a86 Merge branch 'master' into 0.11
Conflicts:
	ext/cairo/gsttextoverlay.c
	ext/pulse/pulseaudiosink.c
	gst/audioparsers/gstaacparse.c
	gst/avi/gstavimux.c
	gst/flv/gstflvmux.c
	gst/interleave/interleave.c
	gst/isomp4/gstqtmux.c
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-mux.h
	gst/matroska/matroska-read-common.c
	gst/multifile/gstmultifilesink.c
	gst/multipart/multipartmux.c
	gst/shapewipe/gstshapewipe.c
	gst/smpte/gstsmpte.c
	gst/udp/gstmultiudpsink.c
	gst/videobox/gstvideobox.c
	gst/videocrop/gstaspectratiocrop.c
	gst/videomixer/videomixer.c
	gst/videomixer/videomixer2.c
	gst/wavparse/gstwavparse.c
	po/ja.po
	po/lv.po
	po/sr.po
	tests/check/Makefile.am
	tests/check/elements/qtmux.c
	tests/check/elements/rgvolume.c
2012-01-10 14:32:32 +01:00
Vincent Penquerc'h
2b2c0940f1 matroskamux: fix codec string leaks 2012-01-09 17:28:17 +00:00
Sebastian Dröge
4cdacf4ca9 videomixer: Remove videomixer and register videomixer2 as videomixer 2012-01-09 14:53:27 +01:00
Mark Nauwelaerts
43986a661d qtdemux: initialize variable to avoid undefined use 2012-01-09 11:38:15 +01:00