From 6484243ceb546a38e1f3a7d82ad041dcf2e48c31 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Mon, 7 Jun 2004 12:01:51 +0000
Subject: [PATCH] AUTHORS: Add me to the authors file

Original commit message from CVS:
* AUTHORS:
Add me to the authors file
* configure.ac:
Increase the libdv requirement to >= version 0.100
* ext/dv/gstdvdec.c: (gst_dvdec_init), (gst_dvdec_src_convert),
(gst_dvdec_src_query), (gst_dvdec_handle_sink_event),
(gst_dvdec_push), (gst_dvdec_loop), (gst_dvdec_change_state):
* ext/dv/gstdvdec.h:
Add support for the new_media flag when sending DISCONT events
Make the querying work when video pad is not linked
---
 AUTHORS      |  1 +
 ChangeLog    | 12 ++++++++++++
 common       |  2 +-
 configure.ac | 13 +++++++++----
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 332bff594c..ca46e98af8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,3 +17,4 @@ David Schleef <ds@schleef.org>
 Benjamin Otte <in7y118@public.uni-hamburg.de>
 Ronald Bultje <rbultje@ronald.bitfreak.net>
 Julien MOUTTE <julien@moutte.net>
+Jan Schmidt <thaytan@mad.scientist.com>
diff --git a/ChangeLog b/ChangeLog
index 0deafea8c5..e1f125ebb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-07  Jan Schmidt <thaytan@mad.scientist.com>
+	* AUTHORS:
+	Add me to the authors file
+	* configure.ac:
+	Increase the libdv requirement to >= version 0.100
+	* ext/dv/gstdvdec.c: (gst_dvdec_init), (gst_dvdec_src_convert),
+	(gst_dvdec_src_query), (gst_dvdec_handle_sink_event),
+	(gst_dvdec_push), (gst_dvdec_loop), (gst_dvdec_change_state):
+	* ext/dv/gstdvdec.h:
+	Add support for the new_media flag when sending DISCONT events
+	Make the querying work when video pad is not linked
+
 2004-06-07  Tim-Philipp Müller  <t.i.m@zen.co.uk>
 
 	reviewed by Benjamin Otte  <otte@gnome.org>
diff --git a/common b/common
index cf0828313f..46a6bafafc 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit cf0828313f7cea4d5840c0959e9113f13309a56f
+Subproject commit 46a6bafafc3f83c5dbccf20eae52db71c67dfe06
diff --git a/configure.ac b/configure.ac
index ab517b242a..f33696f005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1157,7 +1157,7 @@ GST_CHECK_FEATURE(LCS, Lcs, lcs, [
 dnl *** libdv ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
 GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
-  PKG_CHECK_MODULES(LIBDV, libdv >= 0.98, HAVE_LIBDV="yes", HAVE_LIBDV="no")
+  PKG_CHECK_MODULES(LIBDV, libdv >= 0.100, HAVE_LIBDV="yes", HAVE_LIBDV="no")
   AC_SUBST(LIBDV_CFLAGS)
   AC_SUBST(LIBDV_LIBS)
 ])
@@ -1499,11 +1499,16 @@ GST_CHECK_FEATURE(OGG, [ogg de/encoder], oggdemux oggmux, [
 ])
 
 dnl *** theora ***
-dnl FIXME: theora doesn't have proper pc/m4 files yet, change this when this happens
 translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true)
 GST_CHECK_FEATURE(THEORA, [ogg theora codec], theoradec, [
-  GST_CHECK_LIBHEADER(THEORA, theora, theora_version_string, , theora/theora.h, THEORA_LIBS="-ltheora")
-  AC_SUBST(THEORA_LIBS)
+  PKG_CHECK_MODULES(THEORA, theora, [
+    HAVE_THEORA="yes"
+    AC_SUBST(THEORA_LIBS)
+    AC_SUBST(THEORA_CFLAGS)
+  ], [
+    GST_CHECK_LIBHEADER(THEORA, theora, theora_version_string, , theora/theora.h, THEORA_LIBS="-ltheora")
+    AC_SUBST(THEORA_LIBS)
+  ])
 ])
 
 dnl *** vorbis ***