From ef3ed344af7d0eb330f68c85d31acfa9471d1573 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Thu, 18 Dec 2003 09:49:50 +0000
Subject: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3

Original commit message from CVS:
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
---
 ext/ladspa/gstladspa.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'ext/ladspa')

diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index 6dc8763f..6ecb3ce1 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -1,6 +1,7 @@
 /* GStreamer
  * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
  *               <2001> Steve Baker <stevebaker_org@yahoo.co.uk>
+ *               2003 Andy Wingo <wingo at pobox.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,6 +31,11 @@
 #include <ladspa.h>     /* main ladspa sdk include file */
 #include "utils.h"      /* ladspa sdk utility functions */
 
+/* 1.0 and the 1.1 preliminary headers don't define a version, but 1.1 final
+   does */
+#ifndef LADSPA_VERSION
+#define LADSPA_VERSION "1.0"
+#endif
 
 /* takes ownership of the name */
 static GstPadTemplate*
@@ -1038,9 +1044,8 @@ GST_PLUGIN_DEFINE (
   "ladspa",
   "All LADSPA plugins",
   plugin_init,
-  LADSPA_VERSION,
-  "LGPL",
-  "(c) 2003 The LADSPA team",
-  "LADSPA",
-  "http://www.ladspa.org/"
+  VERSION,
+  GST_LICENSE,
+  GST_PACKAGE,
+  GST_ORIGIN
 )
-- 
cgit v1.2.1