Tim-Philipp Müller
|
fb6d09055a
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/alsa/gstalsadeviceprobe.c
ext/alsa/gstalsamixer.c
ext/pango/gsttextoverlay.c
ext/pango/gsttextoverlay.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst/encoding/gststreamcombiner.c
gst/encoding/gststreamsplitter.c
gst/playback/gstplaybasebin.c
gst/playback/gststreamsynchronizer.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
win32/common/libgstvideo.def
Video overlay composition disabled for now, needs
porting to buffer meta.
|
2011-12-08 01:19:03 +00:00 |
|
Tim-Philipp Müller
|
ff6cc8af82
|
tools, tests: g_thread_init() is deprecated in glib master
It's not needed any longer.
|
2011-12-04 17:16:36 +00:00 |
|
Tim-Philipp Müller
|
177525f89f
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst-libs/gst/netbuffer/gstnetbuffer.c
gst/ffmpegcolorspace/avcodec.h
gst/ffmpegcolorspace/gstffmpegcodecmap.c
gst/ffmpegcolorspace/imgconvert.c
gst/ffmpegcolorspace/imgconvert_template.h
gst/ffmpegcolorspace/mem.c
gst/playback/README
gst/playback/gstplaybasebin.c
gst/playback/gstplaybasebin.h
gst/playback/gstplaybin.c
sys/v4l/v4lmjpegsrc_calls.c
sys/v4l/videodev_mjpeg.h
tests/check/elements/gnomevfssink.c
|
2011-12-02 11:10:17 +00:00 |
|
Piotr Fusik
|
14644457b0
|
various: typo fixes
Fix typos in code and docs. Fixes. #658984
|
2011-12-02 12:03:27 +01:00 |
|
Wim Taymans
|
7402d3a3d2
|
update for _get_caps() -> _query_caps()
|
2011-11-15 18:04:17 +01:00 |
|
Stefan Sauer
|
9b96b1a58c
|
build: add audio libs (pulled by pbutils) to avoid linking against system version
|
2011-11-04 15:37:42 +01:00 |
|
Sebastian Dröge
|
d0362c2b87
|
Merge branch 'master' into 0.11
Conflicts:
configure.ac
ext/alsa/gstalsasrc.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/tag/gstxmptag.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
sys/xvimage/xvimagesink.c
|
2011-05-16 17:06:22 +02:00 |
|
Sebastian Dröge
|
7f6697020e
|
tests: Update for negotiation related API changes
|
2011-05-16 15:35:41 +02:00 |
|
Thiago Santos
|
3c3a78f34a
|
encodebin: examples: Add missing base libs to makefile
|
2011-05-15 13:02:39 -03:00 |
|
Tim-Philipp Müller
|
05dce4e2ac
|
tests: fix unused-but-set-variable warnings with gcc 4.6
https://bugzilla.gnome.org/show_bug.cgi?id=647294
|
2011-04-14 00:24:26 +01:00 |
|
Edward Hervey
|
19201c1ab0
|
encoding: encoding_profile_get_output_caps => _get_input_caps
Makes more sense name-wise
|
2011-01-05 22:02:35 +01:00 |
|
Sebastian Dröge
|
c23c706dce
|
examples: Fix encodebin example CFLAGS and LDFLAGS
Previously it would only succeed to link if a new enough
libgstpbutils-0.10 was installed in the default library
search path.
|
2010-12-18 20:47:00 +01:00 |
|
Edward Hervey
|
a5994446b3
|
examples: encoding example
Along with gstcapslist
|
2010-12-15 11:54:32 +01:00 |
|