gstreamer/gst/hls
Wim Taymans 1119f6ee41 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
..
gstfragmented.h hlsdemux: Add HTTP live streaming demuxer element 2011-03-30 09:19:20 +02:00
gstfragmentedplugin.c hlsdemux: Add HTTP live streaming demuxer element 2011-03-30 09:19:20 +02:00
gsthlsdemux.c Merge branch 'master' into 0.11 2012-02-10 16:46:50 +01:00
gsthlsdemux.h hlsdemux: Report the correct timestamp for live streams 2011-09-09 12:21:36 +02:00
m3u8.c plenty: fixup glib deprecations 2012-01-27 15:47:07 +00:00
m3u8.h hlsdemux: Report the correct timestamp for live streams 2011-09-09 12:21:36 +02:00
Makefile.am build: fix CFLAGS order and LIBS order 2012-02-03 00:50:33 +00:00