Merge branch 'move_subdir_rtsp-server' into tizen_gst_1.19.2_mono

Change-Id: I15c0ddc678464e2c8b225170f51f9c0ff3aa10d0

diff --cc subprojects/gst-rtsp-server/.gitlab-ci.yml
Simple merge

diff --cc subprojects/gst-rtsp-server/NEWS
index 0e581c3,0e581c3..0e581c3
mode 100755,100644..100755
--- 1/NEWS
--- 2/subprojects/gst-rtsp-server/NEWS
+++ b/subprojects/gst-rtsp-server/NEWS

diff --cc subprojects/gst-rtsp-server/gst-rtsp-server.doap
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage-ext.c
index 73ce8b1,0000000..73ce8b1
mode 100644,000000..100644
--- 1/gst/rtsp-server/gstwfdmessage-ext.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage-ext.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage-ext.h
index 02f323c,0000000..02f323c
mode 100755,000000..100755
--- 1/gst/rtsp-server/gstwfdmessage-ext.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage-ext.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage.c
index ee8ccce,0000000..ee8ccce
mode 100755,000000..100755
--- 1/gst/rtsp-server/gstwfdmessage.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage.h
index 48d587a,0000000..48d587a
mode 100755,000000..100755
--- 1/gst/rtsp-server/gstwfdmessage.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/gstwfdmessage.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-ext.c
index 3f43973,0000000..3f43973
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-client-ext.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-ext.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-ext.h
index eb73154,0000000..eb73154
mode 100755,000000..100755
--- 1/gst/rtsp-server/rtsp-client-ext.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-ext.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-wfd.c
index a7e492b,0000000..a7e492b
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-client-wfd.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-wfd.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-wfd.h
index dd3c049,0000000..dd3c049
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-client-wfd.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client-wfd.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.c
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-client.h
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-ext.c
index a5d60d0,0000000..a5d60d0
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-media-ext.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-ext.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-ext.h
index 1cca81f,0000000..1cca81f
mode 100755,000000..100755
--- 1/gst/rtsp-server/rtsp-media-ext.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-ext.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-uri.c
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-wfd.c
index b6e087c,0000000..b6e087c
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-media-factory-wfd.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-wfd.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-wfd.h
index 0690908,0000000..0690908
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-media-factory-wfd.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media-factory-wfd.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.c
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-media.h
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-object.h
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-wfd.c
index 6e03395,0000000..6e03395
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-server-wfd.c
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-wfd.c

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-wfd.h
index ea2d319,0000000..ea2d319
mode 100644,000000..100644
--- 1/gst/rtsp-server/rtsp-server-wfd.h
--- /dev/null
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server-wfd.h

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-server.c
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream.c
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-server/rtsp-stream.h
Simple merge

diff --cc subprojects/gst-rtsp-server/gst/rtsp-sink/gstrtspclientsink.c
Simple merge