Merge branch 'upstream/master' into tizen

Change-Id: I6eb03c12b9672f6ad09ad1535351dbc6c0380dc3

diff --cc configure.ac
index 3e79785,88181f6..fc29bbd
mode 100755,100644..100755
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac

diff --cc omx/Makefile.am
Simple merge

diff --cc omx/gstomx.c
index 628851b,7b64aab..2497be0
mode 100755,100644..100755
--- 1/omx/gstomx.c
--- 2/omx/gstomx.c
+++ b/omx/gstomx.c

diff --cc omx/gstomxvideodec.c
index 2475ed2,2368f34..a69c327
mode 100755,100644..100755
--- 1/omx/gstomxvideodec.c
--- 2/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c

diff --cc omx/gstomxvideodec.h
Simple merge

diff --cc omx/gstomxvideoenc.c
index cd6be10,8e6cde3..29cbf4a
mode 100755,100644..100755
--- 1/omx/gstomxvideoenc.c
--- 2/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c

diff --cc omx/gstomxvideoenc.h
index 9ac7f17,176ea99..8266d84
mode 100755,100644..100755
--- 1/omx/gstomxvideoenc.h
--- 2/omx/gstomxvideoenc.h
+++ b/omx/gstomxvideoenc.h