Mark Nauwelaerts
|
087d1e0754
|
Merge remote-tracking branch 'origin/0.10'
Conflicts:
gst/h264parse/gsth264parse.c
gst/videoparsers/gsth264parse.c
|
2012-04-06 14:52:12 +02:00 |
|
Thibault Saunier
|
8238f14b81
|
Merge remote-tracking branch 'origin/0.10'
|
2012-04-05 17:15:11 -04:00 |
|
Sebastian Dröge
|
28e1b08db5
|
gst: Update for GST_PLUGIN_DEFINE() API changes
|
2012-04-05 18:02:56 +02:00 |
|
Sebastian Dröge
|
94f7dcc9c9
|
gst: Update versioning
|
2012-04-04 14:44:34 +02:00 |
|
Sebastian Dröge
|
b9ba049201
|
Merge remote-tracking branch 'origin/0.10'
|
2012-04-04 12:06:08 +02:00 |
|
Sebastian Dröge
|
d1d5cf2bd8
|
Merge remote-tracking branch 'origin/0.10'
Conflicts:
gst/mpegtsdemux/tsdemux.c
|
2012-04-02 15:31:38 +02:00 |
|
Sebastian Dröge
|
4fee4645c7
|
Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-bad
|
2012-03-29 18:04:36 +02:00 |
|
Sebastian Dröge
|
f3cd915103
|
Merge remote-tracking branch 'origin/0.10'
Conflicts:
NEWS
RELEASE
common
configure.ac
docs/libs/gst-plugins-bad-libs-sections.txt
docs/plugins/gst-plugins-bad-plugins.args
docs/plugins/gst-plugins-bad-plugins.hierarchy
docs/plugins/gst-plugins-bad-plugins.interfaces
docs/plugins/inspect/plugin-adpcmdec.xml
docs/plugins/inspect/plugin-adpcmenc.xml
docs/plugins/inspect/plugin-assrender.xml
docs/plugins/inspect/plugin-audiovisualizers.xml
docs/plugins/inspect/plugin-autoconvert.xml
docs/plugins/inspect/plugin-bayer.xml
docs/plugins/inspect/plugin-bz2.xml
docs/plugins/inspect/plugin-camerabin2.xml
docs/plugins/inspect/plugin-celt.xml
docs/plugins/inspect/plugin-dataurisrc.xml
docs/plugins/inspect/plugin-debugutilsbad.xml
docs/plugins/inspect/plugin-dtmf.xml
docs/plugins/inspect/plugin-dtsdec.xml
docs/plugins/inspect/plugin-dvbsuboverlay.xml
docs/plugins/inspect/plugin-dvdspu.xml
docs/plugins/inspect/plugin-faac.xml
docs/plugins/inspect/plugin-faad.xml
docs/plugins/inspect/plugin-gsm.xml
docs/plugins/inspect/plugin-h264parse.xml
docs/plugins/inspect/plugin-mms.xml
docs/plugins/inspect/plugin-modplug.xml
docs/plugins/inspect/plugin-mpeg2enc.xml
docs/plugins/inspect/plugin-mpegdemux2.xml
docs/plugins/inspect/plugin-mpegtsdemux.xml
docs/plugins/inspect/plugin-mpegvideoparse.xml
docs/plugins/inspect/plugin-mplex.xml
docs/plugins/inspect/plugin-pcapparse.xml
docs/plugins/inspect/plugin-rawparse.xml
docs/plugins/inspect/plugin-rtpmux.xml
docs/plugins/inspect/plugin-rtpvp8.xml
docs/plugins/inspect/plugin-scaletempo.xml
docs/plugins/inspect/plugin-schro.xml
docs/plugins/inspect/plugin-sdp.xml
docs/plugins/inspect/plugin-segmentclip.xml
docs/plugins/inspect/plugin-shm.xml
docs/plugins/inspect/plugin-videomaxrate.xml
docs/plugins/inspect/plugin-videoparsersbad.xml
docs/plugins/inspect/plugin-vp8.xml
docs/plugins/inspect/plugin-y4mdec.xml
ext/celt/gstceltdec.c
ext/dts/gstdtsdec.c
ext/modplug/gstmodplug.cc
ext/opus/gstopusenc.c
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
gst-libs/gst/video/gstbasevideoencoder.c
gst-libs/gst/video/gstbasevideoencoder.h
gst/adpcmdec/Makefile.am
gst/audiovisualizers/gstbaseaudiovisualizer.c
gst/h264parse/gsth264parse.c
gst/mpegdemux/mpegtsparse.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/mpegtsparse.c
gst/mpegtsdemux/tsdemux.c
gst/mpegtsdemux/tsdemux.h
gst/mxf/mxfdemux.c
gst/rawparse/gstaudioparse.c
gst/videoparsers/gsth263parse.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
sys/decklink/gstdecklinksink.cpp
sys/dvb/gstdvbsrc.c
sys/shm/gstshmsrc.c
sys/vdpau/h264/gstvdph264dec.c
sys/vdpau/mpeg/gstvdpmpegdec.c
tests/examples/opencv/gst_element_print_properties.c
win32/common/config.h
|
2012-03-29 17:41:53 +02:00 |
|
Wim Taymans
|
710c519edd
|
Merge branch 'master' into 0.11
Conflicts:
gst/colorspace/colorspace.c
|
2012-02-21 10:06:16 +01:00 |
|
Wim Taymans
|
85f94fd1c7
|
Merge branch 'master' into 0.11
Conflicts:
ext/opus/gstopusparse.c
gst/colorspace/colorspace.c
|
2012-02-20 16:07:50 +01:00 |
|
Wim Taymans
|
bbf956433f
|
Merge branch 'master' into 0.11
|
2012-02-17 09:01:56 +01:00 |
|
Wim Taymans
|
aa6b23fc44
|
Merge branch 'master' into 0.11
Conflicts:
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvedemux.c
|
2012-02-16 14:33:20 +01:00 |
|
Mark Nauwelaerts
|
a21d2ec3d4
|
Merge branch 'master' into 0.11
|
2012-02-15 17:14:34 +01:00 |
|
Wim Taymans
|
8dccae3b73
|
Merge branch 'master' into 0.11
|
2012-02-14 11:19:04 +01:00 |
|
Wim Taymans
|
2751606732
|
Merge branch 'master' into 0.11
Conflicts:
ext/chromaprint/gstchromaprint.c
ext/mpeg2enc/Makefile.am
ext/voaacenc/gstvoaacenc.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/mpegtsdemux/mpegtsbase.c
gst/sdp/gstsdpdemux.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
tests/examples/camerabin/gst-camera-perf.c
tests/examples/camerabin/gst-camerabin-test.c
tests/examples/camerabin2/gst-camerabin2-test.c
tests/examples/mxf/mxfdemux-structure.c
tests/examples/scaletempo/demo-main.c
|
2012-02-10 16:46:50 +01:00 |
|
Sebastian Dröge
|
2f63804633
|
Merge branch 'master' into 0.11
Conflicts:
configure.ac
ext/kate/gstkateenc.c
gst/colorspace/colorspace.c
gst/mpegvideoparse/mpegvideoparse.c
|
2012-01-25 13:22:43 +01:00 |
|
Tim-Philipp Müller
|
2ca9496cdc
|
Merge remote-tracking branch 'origin/master' into 0.11
|
2012-01-13 00:11:54 +00:00 |
|
Sebastian Dröge
|
3454e39b9d
|
Merge branch 'master' into 0.11
Conflicts:
gst/mpegtsdemux/tsdemux.c
gst/videoparsers/gsth264parse.c
tests/check/elements/camerabin2.c
|
2012-01-10 15:50:37 +01:00 |
|
Edward Hervey
|
25ad0fe0ed
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
tests/examples/camerabin2/Makefile.am
|
2011-12-30 11:49:27 +01:00 |
|
Edward Hervey
|
c4ea888f41
|
Merge remote-tracking branch 'origin/master' into 0.11-premerge
Conflicts:
docs/libs/Makefile.am
ext/kate/gstkatetiger.c
ext/opus/gstopusdec.c
ext/xvid/gstxvidenc.c
gst-libs/gst/basecamerabinsrc/Makefile.am
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/asfmux/gstasfmux.c
gst/audiovisualizers/gstwavescope.c
gst/camerabin2/gstcamerabin2.c
gst/debugutils/gstcompare.c
gst/frei0r/gstfrei0rmixer.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsmux/mpegtsmux.c
gst/mxf/mxfmux.c
gst/videomeasure/gstvideomeasure_ssim.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpeg4videoparse.c
|
2011-12-30 11:41:17 +01:00 |
|
Tim-Philipp Müller
|
43b1474807
|
Merge remote-tracking branch 'origin/master' into 0.11
|
2011-11-28 23:20:58 +00:00 |
|
Tim-Philipp Müller
|
fdbfd76680
|
Merge commit '7521b597f4dc49d8d168f368f0e7ebaf98a72156' into 0.11
|
2011-11-28 23:20:32 +00:00 |
|
Tim-Philipp Müller
|
d568733375
|
Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11
Conflicts:
ext/rtmp/gstrtmpsink.c
|
2011-11-28 23:20:02 +00:00 |
|
Tim-Philipp Müller
|
c1a4dc99ae
|
Merge remote-tracking branch 'origin/master' into 0.11
|
2011-11-27 23:33:45 +00:00 |
|
Tim-Philipp Müller
|
bbaf1dad99
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusparse.c
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
|
2011-11-26 15:37:25 +00:00 |
|
Edward Hervey
|
d459955d0d
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/audiovisualizers/gstspacescope.c
gst/colorspace/colorspace.c
|
2011-11-25 12:48:58 +01:00 |
|
Wim Taymans
|
e16e3e75e1
|
Merge branch 'master' into 0.11
Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusparse.c
gst/audiovisualizers/gstwavescope.c
gst/filter/Makefile.am
gst/filter/gstfilter.c
gst/filter/gstiir.c
gst/playondemand/gstplayondemand.c
|
2011-11-23 11:08:39 +01:00 |
|
Wim Taymans
|
eeb3f84489
|
Merge branch 'master' into 0.11
Conflicts:
ext/celt/gstceltdec.c
ext/opus/gstopusdec.c
ext/opus/gstopusdec.h
ext/opus/gstopusenc.c
ext/opus/gstopusenc.h
ext/opus/gstopusparse.c
|
2011-11-17 17:32:42 +01:00 |
|
Wim Taymans
|
bc402c0f8f
|
Merge branch 'master' into 0.11
|
2011-11-11 10:39:17 +01:00 |
|
Wim Taymans
|
a55fe10f48
|
Merge branch 'master' into 0.11
|
2011-11-10 18:34:48 +01:00 |
|
Wim Taymans
|
6bab67a8d9
|
Merge branch 'master' into 0.11
|
2011-11-10 12:14:19 +01:00 |
|
Wim Taymans
|
af2e81e3fc
|
Merge branch 'master' into 0.11
|
2011-11-09 12:24:37 +01:00 |
|
Wim Taymans
|
de76a3fe44
|
Merge branch 'master' into 0.11
Conflicts:
gst/colorspace/colorspace.c
|
2011-11-09 12:19:04 +01:00 |
|
Wim Taymans
|
47354d9997
|
Merge branch 'master' into 0.11
|
2011-11-07 10:02:00 +01:00 |
|
Wim Taymans
|
d51d8dd8b7
|
Merge branch 'master' into 0.11
|
2011-11-04 11:01:42 +01:00 |
|
Wim Taymans
|
7b0a9e0815
|
Merge branch 'master' into 0.11
|
2011-11-02 10:31:24 +01:00 |
|
Tim-Philipp Müller
|
52d8d0d060
|
Merge remote-tracking branch 'origin/master' into 0.11
|
2011-10-31 14:51:32 +00:00 |
|
Wim Taymans
|
0e109747ea
|
Merge branch 'master' into 0.11
|
2011-10-27 16:13:56 +02:00 |
|
Wim Taymans
|
89dbb9ea83
|
Merge branch 'master' into 0.11
|
2011-10-18 14:32:05 +02:00 |
|
Wim Taymans
|
5e010ab740
|
Merge branch 'master' into 0.11
|
2011-10-16 15:28:31 +02:00 |
|
Wim Taymans
|
705f3a1032
|
Merge branch 'master' into 0.11
|
2011-10-08 11:17:11 +02:00 |
|
Wim Taymans
|
ae79b905af
|
Merge branch 'master' into 0.11
|
2011-10-06 14:05:42 +02:00 |
|
Wim Taymans
|
325d347f68
|
Merge branch 'master' into 0.11
|
2011-10-04 13:29:21 +02:00 |
|
Wim Taymans
|
d9e286d14c
|
Merge branch 'master' into 0.11
|
2011-10-03 11:24:04 +02:00 |
|
Wim Taymans
|
0e353048da
|
Merge branch 'master' into 0.11
|
2011-09-26 22:31:17 +02:00 |
|
Wim Taymans
|
6c9c1a3014
|
Merge branch 'master' into 0.11
|
2011-09-06 16:13:28 +02:00 |
|
Wim Taymans
|
d764a84c59
|
Merge branch 'master' into 0.11
Conflicts:
ext/resindvd/rsnwrappedbuffer.c
|
2011-08-25 12:49:26 +02:00 |
|
Wim Taymans
|
721204bb32
|
Merge branch 'master' into 0.11
|
2011-08-17 19:01:39 +02:00 |
|
Wim Taymans
|
350d033cca
|
Merge branch 'master' into 0.11
|
2011-08-04 09:40:46 +02:00 |
|
Wim Taymans
|
55aba366e4
|
Merge branch 'master' into 0.11
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
|
2011-08-04 09:36:07 +02:00 |
|