review.tizen.org Git - platform/upstream/gst-plugins-good.git/commit

projects / platform / upstream / gst-plugins-good.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9f4fb6f 50cd7c9)

author	Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
	Thu, 1 Mar 2012 10:29:50 +0000 (11:29 +0100)
committer	Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
	Thu, 1 Mar 2012 10:29:50 +0000 (11:29 +0100)
commit	f189f62b139a5d95b6ad9093566fed09093e1879
tree	cbef8f2507ef138434bce93f44e6c082ec290d12	tree \| snapshot
parent	9f4fb6feb9635695d3345f6f03319004c7210fe4	commit \| diff
parent	50cd7c9ac6f2d64d8b43e03f2b248efa02dafe4c	commit \| diff

Merge branch 'master' into 0.11

Conflicts:
ext/wavpack/gstwavpackenc.c
tests/check/elements/audioiirfilter.c
tests/examples/v4l2/probe.c

15 files changed:

ext/annodex/gstannodex.c	diff1 \|	diff2 \|	blob \| history
ext/pulse/pulseprobe.c	diff1 \|	diff2 \|	blob \| history
ext/wavpack/gstwavpackdec.c	diff1 \|	diff2 \|	blob \| history
ext/wavpack/gstwavpackenc.c	diff1 \|	diff2 \|	blob \| history
gst/audiofx/audiofirfilter.c	diff1 \|	diff2 \|	blob \| history
gst/audiofx/audioiirfilter.c	diff1 \|	diff2 \|	blob \| history
gst/interleave/interleave.c	diff1 \|	diff2 \|	blob \| history
gst/rtpmanager/rtpsession.c	diff1 \|	diff2 \|	blob \| history
gst/udp/gstdynudpsink.c	diff1 \|	diff2 \|	blob \| history
gst/udp/gstmultiudpsink.c	diff1 \|	diff2 \|	blob \| history
sys/v4l2/gstv4l2object.c	diff1 \|	diff2 \|	blob \| history
tests/check/elements/interleave.c	diff1 \|	diff2 \|	blob \| history
tests/examples/pulse/pulse.c	diff1 \|	diff2 \|	blob \| history
tests/examples/rtp/server-alsasrc-PCMA.c	diff1 \|	diff2 \|	blob \| history
tests/icles/test-oss4.c	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;