projects / platform / upstream / gst-omx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 78035a4)
config: Add raspberry-pi configuration in a different directory
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 19 Dec 2012 09:51:22 +0000 (09:51 +0000)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 19 Dec 2012 10:26:36 +0000 (11:26 +0100)
Makefile.am patch | blob | history
config/Makefile.am [new file with mode: 0644] patch | blob
config/raspberry-pi.conf [new file with mode: 0644] patch | blob
configure.ac patch | blob | history
omx/gstomx-raspberry.conf [deleted file] patch | blob | history

diff --git a/Makefile.am b/Makefile.am
index 44f64fd672dccea59dfba5a9e05a7ccd6c581884..69e17f4f0ea7650b3cca17ba906b363582322b66 100644 (file)
--- 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 (file)
index 0000000..5393b5a
--- /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 (file)
index 0000000..8efa838
--- /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 4e7d5507a24de9a66f523c615d3022ce53d416cd..cb75f14fe1b8f05c828c1ef52d20ccf151c01d7d 100644 (file)
--- 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 (file)
index 8efa838..0000000
--- 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
Domain: Multimedia / Codec;