From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Wed, 19 Dec 2012 09:51:22 +0000 (+0000)
Subject: config: Add raspberry-pi configuration in a different directory
X-Git-Tag: 1.0.0~164
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31bf1c8bd6403644a2633afaa2455170ecc24d24;p=platform%2Fupstream%2Fgst-omx.git

config: Add raspberry-pi configuration in a different directory
---

diff --git a/Makefile.am b/Makefile.am
index 44f64fd672d..69e17f4f0ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common omx
+SUBDIRS = common omx config
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644
index 00000000000..5393b5a1577
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = raspberry-pi.conf
diff --git a/config/raspberry-pi.conf b/config/raspberry-pi.conf
new file mode 100644
index 00000000000..8efa838475c
--- /dev/null
+++ b/config/raspberry-pi.conf
@@ -0,0 +1,17 @@
+[omxmpeg4videodec]
+type-name=GstOMXMPEG4VideoDec
+core-name=/opt/vc/lib/libopenmaxil.so
+component-name=OMX.broadcom.video_decode
+rank=256
+in-port-index=130
+out-port-index=131
+hacks=no-empty-eos-buffer;no-component-role
+
+[omxh264dec]
+type-name=GstOMXH264Dec
+core-name=/opt/vc/lib/libopenmaxil.so
+component-name=OMX.broadcom.video_decode
+rank=256
+in-port-index=130
+out-port-index=131
+hacks=no-empty-eos-buffer;no-component-role
diff --git a/configure.ac b/configure.ac
index 4e7d5507a24..cb75f14fe1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,7 @@ Makefile
 omx/Makefile
 common/Makefile
 common/m4/Makefile
+config/Makefile
 )
 
 AC_OUTPUT
diff --git a/omx/gstomx-raspberry.conf b/omx/gstomx-raspberry.conf
deleted file mode 100644
index 8efa838475c..00000000000
--- a/omx/gstomx-raspberry.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[omxmpeg4videodec]
-type-name=GstOMXMPEG4VideoDec
-core-name=/opt/vc/lib/libopenmaxil.so
-component-name=OMX.broadcom.video_decode
-rank=256
-in-port-index=130
-out-port-index=131
-hacks=no-empty-eos-buffer;no-component-role
-
-[omxh264dec]
-type-name=GstOMXH264Dec
-core-name=/opt/vc/lib/libopenmaxil.so
-component-name=OMX.broadcom.video_decode
-rank=256
-in-port-index=130
-out-port-index=131
-hacks=no-empty-eos-buffer;no-component-role