mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-27 23:44:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix build with (Debian's) system ffmpeg. Fixes bug #532803.

Browse source 
Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/gstffmpegcodecmap.c:
* ext/ffmpeg/gstffmpegdemux.c:
* ext/libpostproc/gstpostproc.c:
Fix build with (Debian's) system ffmpeg. Fixes bug #532803.
This commit is contained in:
Sebastian Dröge 2008-05-13 15:07:25 +00:00
parent d1dba0d472
commit 0d7adba925
5 changed files with 97 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-05-13 Sebastian Dröge <slomo@circular-chaos.org>
* configure.ac:
* ext/ffmpeg/gstffmpegcodecmap.c:
* ext/ffmpeg/gstffmpegdemux.c:
* ext/libpostproc/gstpostproc.c:
Fix build with (Debian's) system ffmpeg. Fixes bug #532803.
2008-05-13 Edward Hervey <edward.hervey@collabora.co.uk>
* configure.ac:

7
configure.ac
View file

@ -207,7 +207,7 @@ AC_ARG_WITH(system-ffmpeg,
[AC_HELP_STRING([--with-system-ffmpeg], [use system FFmpeg libraries])])
if test "x$with_system_ffmpeg" = "xyes"; then
PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat)
PKG_CHECK_MODULES(FFMPEG, libavutil libavcodec libavformat libswscale)
PKG_CHECK_MODULES(POSTPROC, libavcodec libpostproc)
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
@ -304,8 +304,9 @@ AC_SUBST(FFMPEG_SUBDIRS)
AC_SUBST(POSTPROC_CFLAGS)
AC_SUBST(POSTPROC_LIBS)
AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, $HAVE_FFMPEG_UNINSTALLED,
[Defined if building against uninstalled FFmpeg source])
if test x$HAVE_FFMPEG_UNINSTALLED = x1; then
AC_DEFINE(HAVE_FFMPEG_UNINSTALLED, [], [Defined if building against uninstalled FFmpeg source])
fi
AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1)
AC_CONFIG_FILES(

1
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -27,6 +27,7 @@
#include <avcodec.h>
#include <libswscale/swscale.h>
#else
#include <ffmpeg/swscale.h>
#include <ffmpeg/avcodec.h>
#endif
#include <string.h>

2
ext/ffmpeg/gstffmpegdemux.c
View file

@ -31,8 +31,10 @@
#endif
#else
#include <ffmpeg/avformat.h>
#ifdef HAVE_AVI_H
#include <ffmpeg/avi.h>
#endif
#endif
#include <gst/gst.h>
#include "gstffmpeg.h"

21
ext/libpostproc/gstpostproc.c
View file

@ -33,13 +33,14 @@
#include <postprocess.h>
#else
#include <ffmpeg/avcodec.h>
#include <ffmpeg/libpostproc/postprocess.h>
#include <postproc/postprocess.h>
#endif
typedef struct _PostProcDetails PostProcDetails;
struct _PostProcDetails {
struct _PostProcDetails
{
char *shortname;
char *longname;
char *description;
@ -194,8 +195,8 @@ static void gst_post_proc_base_init (GstPostProcClass * klass);
static void gst_post_proc_init (GstPostProc * pproc);
static void gst_post_proc_dispose (GObject * object);
static gboolean gst_post_proc_setcaps (GstBaseTransform * btrans, GstCaps * incaps,
GstCaps * outcaps);
static gboolean gst_post_proc_setcaps (GstBaseTransform * btrans,
GstCaps * incaps, GstCaps * outcaps);
static GstFlowReturn gst_post_proc_transform_ip (GstBaseTransform * btrans,
GstBuffer * in);
@ -239,8 +240,7 @@ gst_pp_scope_get_type (void)
};
if (!pp_scope_type) {
pp_scope_type =
g_enum_register_static ("GstPostProcPPScope", pp_scope);
pp_scope_type = g_enum_register_static ("GstPostProcPPScope", pp_scope);
}
return pp_scope_type;
}
@ -363,7 +363,8 @@ gst_post_proc_base_init (GstPostProcClass * klass)
details.klass = "Filter/Video";
details.description = g_strdup_printf ("LibPostProc %s",
filterdetails[ppidx].description);
details.author = "Edward Hervey <edward@fluendo.com>, Mark Nauwelaerts (manauw@skynet.be)";
details.author =
"Edward Hervey <edward@fluendo.com>, Mark Nauwelaerts (manauw@skynet.be)";
gst_element_class_set_details (element_class, &details);
g_free (details.longname);
g_free (details.description);
@ -380,6 +381,7 @@ static void
gst_post_proc_class_init (GstPostProcClass * klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
/* GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); */
GstBaseTransformClass *btrans_class = GST_BASE_TRANSFORM_CLASS (klass);
gint ppidx;
@ -449,8 +451,7 @@ gst_post_proc_class_init (GstPostProcClass * klass)
/* autolevels */
g_object_class_install_property (gobject_class, PROP_RANGE,
g_param_spec_boolean ("fully-range", "Fully Range",
"Stretch luminance to (0-255)",
DEFAULT_RANGE, G_PARAM_READWRITE));
"Stretch luminance to (0-255)", DEFAULT_RANGE, G_PARAM_READWRITE));
gobject_class->set_property =
GST_DEBUG_FUNCPTR (gst_post_proc_autolevels_set_property);
@ -899,5 +900,3 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
"postprocessing elements (" FFMPEG_SOURCE ")",
plugin_init,
PACKAGE_VERSION, "GPL", "FFMpeg", "http://ffmpeg.sourceforge.net/")