review.tizen.org Git - platform/upstream/gstreamer.git/commit

projects / platform / upstream / gstreamer.git / commit

author	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Tue, 10 Jan 2012 12:15:12 +0000 (13:15 +0100)
committer	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Tue, 10 Jan 2012 12:15:12 +0000 (13:15 +0100)
commit	dc8984d76ca6a84625f22b728e12396698f257a4
tree	430af44583a0f4a8ebdf4c8b12083800747a3e8d	tree \| snapshot
parent	ed53219e49eb6f5b2d92abb3136c41b9653c0190	commit \| diff
parent	e8fd3056233d28d4301fc2b92882fed31ae0e68a	commit \| diff

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

24 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
docs/libs/gst-plugins-base-libs-sections.txt	diff1 \|	diff2 \|	blob \| history
ext/pango/gstclockoverlay.c	diff1 \|	diff2 \|	blob \| history
ext/pango/gsttimeoverlay.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsrc.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsrc.h	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/pbutils/gstdiscoverer-types.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/pbutils/gstdiscoverer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/rtp/gstrtcpbuffer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/rtsp/gstrtspconnection.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/tag/tag.h	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/tag/tags.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/video-overlay-composition.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/videooverlay.c	diff1 \|	diff2 \|	blob \| history
gst/audiotestsrc/gstaudiotestsrc.c	diff1 \|	diff2 \|	blob \| history
gst/encoding/gstsmartencoder.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplay-enum.h	diff1 \|	diff2 \|	blob \| history
gst/playback/gststreamsynchronizer.c	diff1 \|	diff2 \|	blob \| history
gst/videotestsrc/Makefile.am	diff1 \|	diff2 \|	blob \| history
gst/videotestsrc/videotestsrc.c	diff1 \|	diff2 \|	blob \| history
tests/check/Makefile.am	diff1 \|	diff2 \|	blob \| history
tests/check/libs/tag.c	diff1 \|	diff2 \|	blob \| history
tools/gst-discoverer.c	diff1 \|	diff2 \|	blob \| history
win32/common/libgsttag.def	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
docs/libs/gst-plugins-base-libs-sections.txt	diff1 \|	diff2 \|	blob \| history
ext/pango/gstclockoverlay.c	diff1 \|	diff2 \|	blob \| history
ext/pango/gsttimeoverlay.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsrc.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/app/gstappsrc.h	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/pbutils/gstdiscoverer-types.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/pbutils/gstdiscoverer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/rtp/gstrtcpbuffer.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/rtsp/gstrtspconnection.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/tag/tag.h	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/tag/tags.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/video-overlay-composition.c	diff1 \|	diff2 \|	blob \| history
gst-libs/gst/video/videooverlay.c	diff1 \|	diff2 \|	blob \| history
gst/audiotestsrc/gstaudiotestsrc.c	diff1 \|	diff2 \|	blob \| history
gst/encoding/gstsmartencoder.c	diff1 \|	diff2 \|	blob \| history
gst/playback/gstplay-enum.h	diff1 \|	diff2 \|	blob \| history
gst/playback/gststreamsynchronizer.c	diff1 \|	diff2 \|	blob \| history
gst/videotestsrc/Makefile.am	diff1 \|	diff2 \|	blob \| history
gst/videotestsrc/videotestsrc.c	diff1 \|	diff2 \|	blob \| history
tests/check/Makefile.am	diff1 \|	diff2 \|	blob \| history
tests/check/libs/tag.c	diff1 \|	diff2 \|	blob \| history
tools/gst-discoverer.c	diff1 \|	diff2 \|	blob \| history
win32/common/libgsttag.def	diff1 \|	diff2 \|	blob \| history