mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 23:36:38 +00:00
configure.ac: postproc filters need liboil to detect the cpu architecture
Original commit message from CVS: Reviewed by: Edward Hervey <edward@fluendo.com> * configure.ac: postproc filters need liboil to detect the cpu architecture * ext/libpostproc/Makefile.am: Update for liboil requirement, libpostproc being moved around in ffmpeg mirror, and removal of unused header file. * ext/libpostproc/gstpostproc.h: Header file not needed anymore * ext/libpostproc/gstpostproc.c: (gst_pp_scope_get_type), (change_context), (append), (change_mode), (gst_post_proc_base_init), (gst_post_proc_class_init), (gst_post_proc_init), (gst_post_proc_dispose), (gst_post_proc_setcaps), (gst_post_proc_transform_ip), (gst_post_proc_set_property), (gst_post_proc_get_property), (gst_post_proc_deblock_set_property), (gst_post_proc_deblock_get_property), (gst_post_proc_tmpnoise_set_property), (gst_post_proc_tmpnoise_get_property), (gst_post_proc_autolevels_set_property), (gst_post_proc_autolevels_get_property), (gst_post_proc_forcequant_set_property), (gst_post_proc_forcequant_get_property), (gst_post_proc_register), (plugin_init): Port of postprocessing elements to 0.10.
This commit is contained in:
parent
5e39aa8e8e
commit
8b9468e7c7
5 changed files with 666 additions and 289 deletions
28
ChangeLog
28
ChangeLog
|
@ -1,3 +1,31 @@
|
|||
2006-10-20 Mark Nauwelaerts <manauw@skynet.be>
|
||||
|
||||
Reviewed by: Edward Hervey <edward@fluendo.com>
|
||||
|
||||
* configure.ac:
|
||||
postproc filters need liboil to detect the cpu architecture
|
||||
* ext/libpostproc/Makefile.am:
|
||||
Update for liboil requirement, libpostproc being moved around in
|
||||
ffmpeg mirror, and removal of unused header file.
|
||||
* ext/libpostproc/gstpostproc.h:
|
||||
Header file not needed anymore
|
||||
* ext/libpostproc/gstpostproc.c: (gst_pp_scope_get_type),
|
||||
(change_context), (append), (change_mode),
|
||||
(gst_post_proc_base_init), (gst_post_proc_class_init),
|
||||
(gst_post_proc_init), (gst_post_proc_dispose),
|
||||
(gst_post_proc_setcaps), (gst_post_proc_transform_ip),
|
||||
(gst_post_proc_set_property), (gst_post_proc_get_property),
|
||||
(gst_post_proc_deblock_set_property),
|
||||
(gst_post_proc_deblock_get_property),
|
||||
(gst_post_proc_tmpnoise_set_property),
|
||||
(gst_post_proc_tmpnoise_get_property),
|
||||
(gst_post_proc_autolevels_set_property),
|
||||
(gst_post_proc_autolevels_get_property),
|
||||
(gst_post_proc_forcequant_set_property),
|
||||
(gst_post_proc_forcequant_get_property), (gst_post_proc_register),
|
||||
(plugin_init):
|
||||
Port of postprocessing elements to 0.10.
|
||||
|
||||
2006-10-13 Edward Hervey <edward@fluendo.com>
|
||||
|
||||
* ext/ffmpeg/gstffmpegcodecmap.c:
|
||||
|
|
12
configure.ac
12
configure.ac
|
@ -38,6 +38,8 @@ AM_PROG_LIBTOOL
|
|||
|
||||
dnl *** required versions of GStreamer stuff ***
|
||||
GST_REQ=0.10.4
|
||||
LIBOIL_MAJORMINOR=0.3
|
||||
LIBOIL_REQ=0.3.6
|
||||
|
||||
dnl *** autotools stuff ****
|
||||
|
||||
|
@ -104,6 +106,16 @@ GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
|
|||
AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR)
|
||||
AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
|
||||
|
||||
dnl liboil is required
|
||||
PKG_CHECK_MODULES(LIBOIL, liboil-$LIBOIL_MAJORMINOR >= $LIBOIL_REQ, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
|
||||
if test "x$HAVE_LIBOIL" != "xyes"
|
||||
then
|
||||
AC_ERROR([liboil-$LIBOIL_REQ or later is required])
|
||||
fi
|
||||
|
||||
AC_SUBST(LIBOIL_CFLAGS)
|
||||
AC_SUBST(LIBOIL_LIBS)
|
||||
|
||||
dnl *** set variables based on configure arguments ***
|
||||
|
||||
dnl set location of plugin directory
|
||||
|
|
|
@ -1,16 +1,14 @@
|
|||
#plugin_LTLIBRARIES = libgstpostproc.la
|
||||
#
|
||||
#libgstpostproc_la_SOURCES = gstpostproc.c
|
||||
#
|
||||
#libgstpostproc_la_CFLAGS = $(GST_CFLAGS) \
|
||||
# -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
|
||||
# -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec
|
||||
#libgstpostproc_la_LIBADD = \
|
||||
# $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \
|
||||
# $(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libavcodec.la
|
||||
# $(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libpostproc/libffpostproc.la
|
||||
#
|
||||
#libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
#
|
||||
#noinst_HEADERS = \
|
||||
# gstpostproc.h
|
||||
plugin_LTLIBRARIES = libgstpostproc.la
|
||||
|
||||
libgstpostproc_la_SOURCES = gstpostproc.c
|
||||
|
||||
libgstpostproc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) \
|
||||
-I $(top_srcdir)/gst-libs/ext/ffmpeg \
|
||||
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
|
||||
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \
|
||||
-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec
|
||||
libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \
|
||||
$(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libavcodec.la \
|
||||
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
|
||||
|
||||
libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2005 Edward Hervey (edward@fluendo.com)
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __GST_POSTPROC_H__
|
||||
#define __GST_POSTPROC_H__
|
||||
|
||||
#ifdef HAVE_FFMPEG_UNINSTALLED
|
||||
#include <avcodec.h>
|
||||
#include <avformat.h>
|
||||
#else
|
||||
#include <ffmpeg/avcodec.h>
|
||||
#include <ffmpeg/avformat.h>
|
||||
#endif
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
||||
GST_DEBUG_CATEGORY_EXTERN (postproc_debug);
|
||||
#define GST_CAT_DEFAULT postproc_debug
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
extern gboolean gst_postproc_register (GstPlugin * plugin);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
Loading…
Reference in a new issue