Merge branch 'upstream/master' into tizen 12/53212/1
authorSejun Park <sejun79.park@samsung.com>
Wed, 2 Dec 2015 23:55:28 +0000 (08:55 +0900)
committerSejun Park <sejun79.park@samsung.com>
Wed, 2 Dec 2015 23:56:19 +0000 (08:56 +0900)
commit19df7bd4c530695c02392804c77ad0157be274d1
treec53f26c82b29f66b76acd4d0530643c051a57908
parent455cc3eee8723807c8fa47976a3f96d9934c90a2
parent271093d6338f01501fc0bb1965e90f6b441f62fb
Merge branch 'upstream/master' into tizen

Change-Id: I6eb03c12b9672f6ad09ad1535351dbc6c0380dc3
configure.ac
omx/Makefile.am
omx/gstomx.c
omx/gstomxvideodec.c
omx/gstomxvideodec.h
omx/gstomxvideoenc.c
omx/gstomxvideoenc.h