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

avfoundation

Update copyright headers

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

directshow

Update copyright headers

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

evr

Update copyright headers

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

gpu_vivante

Update copyright headers

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

gstreamer

Update copyright headers

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

gstreamer_appsrc

Update copyright headers

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

gstreamer_encodingprofiles

Update copyright headers

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

gstreamer_photography

Update copyright headers

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

linux_v4l

Update copyright headers

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

mmrenderer

Update copyright headers

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

openal

Update copyright headers

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

pulseaudio

Update copyright headers

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

resourcepolicy

Update copyright headers

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

wmf

Update copyright headers

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

wmsdk

Update copyright headers

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

wshellitem

Update copyright headers

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