Mark Nauwelaerts
|
26dd999b68
|
Merge branch 'master' into 0.11
Conflicts:
ext/wavpack/gstwavpackparse.c
sys/v4l2/gstv4l2bufferpool.c
sys/v4l2/gstv4l2bufferpool.h
sys/v4l2/gstv4l2videooverlay.c
|
2012-03-05 13:29:59 +01:00 |
|
Wim Taymans
|
1584806634
|
port to new gthread API
|
2012-01-19 11:33:53 +01: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 |
|
Stefan Sauer
|
2468492f02
|
interfaces: clean up the use of iface and class/klass
|
2011-10-21 14:58:41 +02:00 |
|
Tim-Philipp Müller
|
d5db5ca9be
|
v4l2: update for GstXOverlay => GstVideoOverlay rename
|
2011-08-08 15:25:31 +01:00 |
|