Frederik Gladhorn 39bb642cb2 Merge remote-tracking branch 'origin/5.4' into 5.5 ...

Conflicts:
	qtmultimedia.pro
	src/gsttools/qgstreamervideowidget.cpp
	src/plugins/gstreamer/camerabin/camerabinservice.cpp

Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99

2015-02-24 17:38:46 +01:00

..

audiodecoder

Update copyright headers

2015-02-12 10:27:47 +00:00

camerabin

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-02-24 17:38:46 +01:00

mediacapture

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-02-24 17:38:46 +01:00

mediaplayer

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-02-24 17:38:46 +01:00

common.pri

GStreamer: port to 1.0.

2014-11-27 23:30:05 +01:00

gstreamer.json

Multimedia plugins now have a unique JSON metadata 'Keys' property.

2013-06-21 12:07:00 +02:00

gstreamer.pro

GStreamer: port to 1.0.

2014-11-27 23:30:05 +01:00