Commit graph

12 commits

Author SHA1 Message Date
Sebastian Dröge
a01a4ea2d3 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
Vincent Penquerc'h
74952a15bf tests: test for GTK 2.24 for new symbols used in camerabin2 tests
The whole tree is likely to switch to GTK 3.0 at some point, but
we might as well continue building with slightly less new versions
if it's not hard to do.
2012-01-05 11:02:25 +00:00
Edward Hervey
4917e16458 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	tests/examples/camerabin2/Makefile.am
2011-12-30 11:49:27 +01:00
Thiago Santos
b778d8a27e examples: camerabin2: add some error handling for format changing
Check that the format could be initialized and shows a modal dialog
in case it couldn't.
2011-12-29 13:30:13 -03:00
Thiago Santos
0ef2d627be examples: camerabin2: add format selection for camerabin2 example
Adds a combobox for selecting the video profile for recordings.
Useful for testing multiple formats a/v sync when recording.
2011-12-29 12:47:48 -03:00
Wim Taymans
759d62bafe fix for moved interfaces 2011-11-29 19:11:22 +01:00
Edward Hervey
4642c67d30 examples : Port to 0.11 2011-11-04 16:23:03 +01:00
Arun Raghavan
2c4bc6134c examples: Fixes for compiling with GTK+ 3.0
camerabing example had a missing ')' and the fix to build against GTK+3
that was introduced in commit 516c977c76
is also applied to the camerabin2 example.

The scaletempo demo was using API which has been removed, so that's
wrapped in a version check.
2011-10-06 23:22:51 +05:30
Stefan Kost
4915493932 camerabin-tests: fix lookup of UI files
These are uninstalled examples. Pass $srcdir to cpp to build the correct
location for the UI file.
2011-02-07 11:28:23 +02:00
Stefan Kost
d63365fc5b camerabin2: use g_error_free instead of g_free 2011-01-12 16:56:28 +02:00
Thiago Santos
397f7fcceb examples: camerabin2: Print more info
Add some printing for error/eos cases.
2010-12-08 15:38:29 -03:00
Thiago Santos
8fb8822532 examples: Adds camerabin2 example
Adds gtk camerabin2 example app
2010-12-08 15:38:27 -03:00