From 64b869ea401d9520a9f60aa8549caeb10eae1a7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 13 Dec 2012 17:56:01 +0000 Subject: [PATCH] dvm: Rename gst-dvm.[ch] to gstdvm.[ch] for consistency with other GStreamer code --- gst-libs/gst/dvm/Makefile.am | 4 ++-- gst-libs/gst/dvm/{gst-dvm.c => gstdvm.c} | 2 +- gst-libs/gst/dvm/{gst-dvm.h => gstdvm.h} | 0 sys/androidcamera/Makefile.am | 4 +++- sys/androidcamera/gst-android-graphics-imageformat.c | 2 +- sys/androidcamera/gst-android-graphics-surfacetexture.c | 2 +- sys/androidcamera/gst-android-hardware-camera.c | 2 +- sys/androidcamera/gst-androidcamera.c | 2 +- sys/androidcamera/gstahcsrc.c | 2 +- sys/androidmedia/gst-android-media-mediacodec.c | 2 +- sys/androidmedia/gst-android-media-mediacodecinfo.c | 2 +- sys/androidmedia/gst-android-media-mediacodeclist.c | 2 +- sys/androidmedia/gst-android-media-mediaformat.c | 2 +- 13 files changed, 15 insertions(+), 13 deletions(-) rename gst-libs/gst/dvm/{gst-dvm.c => gstdvm.c} (99%) rename gst-libs/gst/dvm/{gst-dvm.h => gstdvm.h} (100%) diff --git a/gst-libs/gst/dvm/Makefile.am b/gst-libs/gst/dvm/Makefile.am index d2f4d2aba..3da6f8616 100644 --- a/gst-libs/gst/dvm/Makefile.am +++ b/gst-libs/gst/dvm/Makefile.am @@ -2,10 +2,10 @@ lib_LTLIBRARIES = libgstdvm-@GST_MAJORMINOR@.la libgstdvmincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dvm libgstdvminclude_HEADERS = \ - gst-dvm.h + gstdvm.h libgstdvm_@GST_MAJORMINOR@_la_SOURCES = \ - gst-dvm.c + gstdvm.c libgstdvm_@GST_MAJORMINOR@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ diff --git a/gst-libs/gst/dvm/gst-dvm.c b/gst-libs/gst/dvm/gstdvm.c similarity index 99% rename from gst-libs/gst/dvm/gst-dvm.c rename to gst-libs/gst/dvm/gstdvm.c index 8f84b0caa..82dea7b75 100644 --- a/gst-libs/gst/dvm/gst-dvm.c +++ b/gst-libs/gst/dvm/gstdvm.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "gst-dvm.h" +#include "gstdvm.h" #include diff --git a/gst-libs/gst/dvm/gst-dvm.h b/gst-libs/gst/dvm/gstdvm.h similarity index 100% rename from gst-libs/gst/dvm/gst-dvm.h rename to gst-libs/gst/dvm/gstdvm.h diff --git a/sys/androidcamera/Makefile.am b/sys/androidcamera/Makefile.am index f2a6ac5e2..e24e94404 100644 --- a/sys/androidcamera/Makefile.am +++ b/sys/androidcamera/Makefile.am @@ -18,6 +18,7 @@ noinst_HEADERS = \ gst-android-graphics-imageformat.h libgstandroidcamera_la_CFLAGS = \ + $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ @@ -25,7 +26,8 @@ libgstandroidcamera_la_CFLAGS = \ libgstandroidcamera_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ - $(GST_LIBS) + $(GST_LIBS) \ + $(top_builddir)/gst-libs/gst/dvm/libgstdvm-@GST_MAJORMINOR@.la libgstandroidcamera_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstandroidcamera_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/androidcamera/gst-android-graphics-imageformat.c b/sys/androidcamera/gst-android-graphics-imageformat.c index 3140af048..577131f27 100644 --- a/sys/androidcamera/gst-android-graphics-imageformat.c +++ b/sys/androidcamera/gst-android-graphics-imageformat.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include "gst-android-graphics-imageformat.h" diff --git a/sys/androidcamera/gst-android-graphics-surfacetexture.c b/sys/androidcamera/gst-android-graphics-surfacetexture.c index bb78f0273..06a29453f 100644 --- a/sys/androidcamera/gst-android-graphics-surfacetexture.c +++ b/sys/androidcamera/gst-android-graphics-surfacetexture.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include "gst-android-graphics-surfacetexture.h" diff --git a/sys/androidcamera/gst-android-hardware-camera.c b/sys/androidcamera/gst-android-hardware-camera.c index 945c6e6cf..09940b662 100644 --- a/sys/androidcamera/gst-android-hardware-camera.c +++ b/sys/androidcamera/gst-android-hardware-camera.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include "gstahccallback.h" #include "gst-android-hardware-camera.h" diff --git a/sys/androidcamera/gst-androidcamera.c b/sys/androidcamera/gst-androidcamera.c index 6aa2d412c..d836add3e 100644 --- a/sys/androidcamera/gst-androidcamera.c +++ b/sys/androidcamera/gst-androidcamera.c @@ -23,7 +23,7 @@ #endif #include -#include +#include #include "gst-android-hardware-camera.h" #include "gstahcsrc.h" diff --git a/sys/androidcamera/gstahcsrc.c b/sys/androidcamera/gstahcsrc.c index 6f8f056e9..7ed1f2297 100644 --- a/sys/androidcamera/gstahcsrc.c +++ b/sys/androidcamera/gstahcsrc.c @@ -73,7 +73,7 @@ #include #include #include -#include +#include #include "gstahcsrc.h" diff --git a/sys/androidmedia/gst-android-media-mediacodec.c b/sys/androidmedia/gst-android-media-mediacodec.c index 5cdbbd3a6..f87669c30 100644 --- a/sys/androidmedia/gst-android-media-mediacodec.c +++ b/sys/androidmedia/gst-android-media-mediacodec.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include "gst-android-media-mediacodec.h" diff --git a/sys/androidmedia/gst-android-media-mediacodecinfo.c b/sys/androidmedia/gst-android-media-mediacodecinfo.c index bd897a737..86df3e0f9 100644 --- a/sys/androidmedia/gst-android-media-mediacodecinfo.c +++ b/sys/androidmedia/gst-android-media-mediacodecinfo.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include "gst-android-media-mediacodecinfo.h" diff --git a/sys/androidmedia/gst-android-media-mediacodeclist.c b/sys/androidmedia/gst-android-media-mediacodeclist.c index faa5a8f89..dddcf13dd 100644 --- a/sys/androidmedia/gst-android-media-mediacodeclist.c +++ b/sys/androidmedia/gst-android-media-mediacodeclist.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include "gst-android-media-mediacodeclist.h" diff --git a/sys/androidmedia/gst-android-media-mediaformat.c b/sys/androidmedia/gst-android-media-mediaformat.c index e0ed33839..ee1529b6c 100644 --- a/sys/androidmedia/gst-android-media-mediaformat.c +++ b/sys/androidmedia/gst-android-media-mediaformat.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include #include #include "gst-android-media-mediaformat.h" -- 2.34.1