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
..
2011-12-25 22:21:36 +00:00
2011-12-25 22:21:36 +00:00
2011-12-21 11:59:46 +01:00
2008-06-10 06:45:33 +00:00
2010-12-11 16:08:40 +11:00
2011-11-30 07:57:40 +01:00
2008-08-20 17:46:48 +00:00
2008-06-10 06:45:33 +00:00
2009-10-17 08:48:23 +02:00
2011-12-21 11:59:46 +01:00
2012-01-10 14:32:32 +01:00
2012-01-05 10:30:30 +01:00
2012-01-05 10:30:30 +01:00
2011-11-26 13:54:22 +00:00
2012-01-05 10:30:30 +01:00
2011-11-26 13:54:22 +00:00