From: Andy Wingo <wingo@pobox.com>
Date: Fri, 29 Mar 2002 00:23:16 +0000 (+0000)
Subject: some s/KHz/Hz/ fixes in osssrc consistency-with-the-rest-of-gst adjustments
X-Git-Tag: 1.19.3~511^2~16063
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5332721c8bea88a9ef0ac7e60a450ae254b7dc94;p=platform%2Fupstream%2Fgstreamer.git

some s/KHz/Hz/ fixes in osssrc consistency-with-the-rest-of-gst adjustments

Original commit message from CVS:
* some s/KHz/Hz/ fixes in osssrc
* added dxr3 plugin from rehan khwaja <rehankhwaja@yahoo.com>, with some
consistency-with-the-rest-of-gst adjustments
---

diff --git a/configure.ac b/configure.ac
index bea6e4a..d8fe94a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,12 @@ dnl ============================= sys plugins ================================
 dnl ==========================================================================
 
 
+dnl *** DXR3 card ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_DXR3, true)
+GST_CHECK_FEATURE(DXR3, [DXR3 hardware mpeg video decoder], dxr3videosink, [
+  AC_CHECK_HEADER(linux/em8000.h, HAVE_DXR3="yes", HAVE_DXR3="no")
+])
+
 dnl *** OSS audio ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
 GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
@@ -762,6 +768,7 @@ gst/vumeter/Makefile
 gst/wavparse/Makefile
 gst/y4m/Makefile
 sys/Makefile
+sys/dxr3/Makefile
 sys/oss/Makefile
 sys/qcam/Makefile
 sys/v4l/Makefile
diff --git a/sys/Makefile.am b/sys/Makefile.am
index c915c89..8c6db9a 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -1,3 +1,9 @@
+if USE_DXR3
+DXR3_DIR=dxr3
+else
+DXR3_DIR=
+endif
+
 if USE_OSS
 OSS_DIR=oss
 else
@@ -34,8 +40,8 @@ else
 XVIDEO_DIR=
 endif
 
-SUBDIRS=$(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \
+SUBDIRS=$(OSS_DIR) $(DXR3_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \
 	$(VGA_DIR) $(XVIDEO_DIR)
 
-DIST_SUBDIRS=oss qcam v4l vcd vga xvideo videosink
+DIST_SUBDIRS=oss dxr3 qcam v4l vcd vga xvideo videosink