Liang Qi 6166f102f5 Merge remote-tracking branch 'origin/5.5' into 5.6 ...

Conflicts:
	src/plugins/android/src/wrappers/jni/androidcamera.cpp

Change-Id: Ibb34f710b1dfb9a23b378462f31432581c6c26f4

2016-01-07 11:13:47 +01:00

..

alsa

alsa: Relax ALSA version checks for 1.1.x to be detected.

2015-11-27 22:41:13 +00:00

android

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

2016-01-07 11:13:47 +01:00

audiocapture

Implement volume in audiocapture plugin.

2015-11-23 11:48:37 +00:00

avfoundation

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

2016-01-07 11:13:47 +01:00

common

DirectShow: use the EVR in the window control.

2015-11-05 11:34:55 +00:00

coreaudio

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

2015-04-15 09:26:14 +02:00

directshow

DirectShow: fix metadata signals when changing media.

2016-01-06 15:20:59 +00:00

gstreamer

GStreamer: Add color balance and sharpening adjustments using V4L2

2015-12-10 16:07:26 +00:00

m3u

Update copyright headers

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

opensles

Update copyright headers

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

pulseaudio

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

2015-11-20 16:21:38 +01:00

qnx

QNX: Handling looping properly

2015-12-03 11:57:51 +00:00

qnx-audio

Update copyright headers

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

resourcepolicy

Update copyright headers

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

v4l

Update copyright headers

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

videonode

videonode: imx6: Ensure the video node excludes padding pixels

2015-05-26 11:57:56 +00:00

windowsaudio

WindowsAudio: Fix compiler warnings by g++/MinGW.

2015-07-13 13:42:41 +00:00

winrt

winrt: Fix Lumia 930 black viewfinder.

2015-11-27 14:45:13 +00:00

wmf

WMF: correctly handle media with multiple streams.

2015-12-04 11:41:52 +00:00

plugins.pro

Check for the quick module before adding the videonode plugin

2015-02-27 12:37:14 +00:00