From 42cbd632976d2c9d5293ad03418dce3c7db2797d Mon Sep 17 00:00:00 2001
From: Thibaut Mattern <thibaut.mattern@gmail.com>
Date: Fri, 6 Apr 2007 15:28:37 +0200
Subject: - Moved base64 stuff to xine-utils. - Added config entry
 serialization. - Added serialized config entries to the plugin cache.

--HG--
rename : src/input/base64.c => src/xine-utils/base64.c
rename : src/input/base64.h => src/xine-utils/base64.h
---
 src/input/Makefile.am |   2 +-
 src/input/base64.c    | 135 --------------------------------------------------
 src/input/base64.h    |  95 -----------------------------------
 3 files changed, 1 insertion(+), 231 deletions(-)
 delete mode 100644 src/input/base64.c
 delete mode 100644 src/input/base64.h

(limited to 'src/input')

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 68adf84be..1b6378efc 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -126,7 +126,7 @@ xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la lib
 xineplug_inp_rtsp_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
 xineplug_inp_rtsp_la_LDFLAGS = -avoid-version -module
 
-xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h
+xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h 
 xineplug_inp_cdda_la_LIBADD = $(XINE_LIB)
 xineplug_inp_cdda_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
 xineplug_inp_cdda_la_LDFLAGS = -avoid-version -module
diff --git a/src/input/base64.c b/src/input/base64.c
deleted file mode 100644
index 0eccbe84e..000000000
--- a/src/input/base64.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2000 Robert Kaye
- *
- * This file is part of xine, a free video player.
- *
- * xine 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.
- *
- * xine 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
- *
- * Base64 encoding modified for Musicbrainz
- *   relicensed under the GNU General Public License for use in xine-lib
- *
- */
-/* --------------------------------------------------------------------------
-
-   MusicBrainz -- The Internet music metadatabase
-
-   Copyright (C) 2000 Robert Kaye
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-   
-   This library 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
-   Lesser General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-     $Id: base64.c,v 1.2 2004/05/05 18:44:19 mroi Exp $
-
-----------------------------------------------------------------------------*/
-/*
- * Program:	RFC-822 routines (originally from SMTP)
- *
- * Author:	Mark Crispin
- *		Networks and Distributed Computing
- *		Computing & Communications
- *		University of Washington
- *		Administration Building, AG-44
- *		Seattle, WA  98195
- *		Internet: MRC@CAC.Washington.EDU
- *
- * Date:	27 July 1988
- * Last Edited:	10 September 1998
- *
- * Sponsorship:	The original version of this work was developed in the
- *		Symbolic Systems Resources Group of the Knowledge Systems
- *		Laboratory at Stanford University in 1987-88, and was funded
- *		by the Biomedical Research Technology Program of the National
- *		Institutes of Health under grant number RR-00785.
- *
- * Original version Copyright 1988 by The Leland Stanford Junior University
- * Copyright 1998 by the University of Washington
- *
- *  Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notices appear in all copies and that both the
- * above copyright notices and this permission notice appear in supporting
- * documentation, and that the name of the University of Washington or The
- * Leland Stanford Junior University not be used in advertising or publicity
- * pertaining to distribution of the software without specific, written prior
- * permission.  This software is made available "as is", and
- * THE UNIVERSITY OF WASHINGTON AND THE LELAND STANFORD JUNIOR UNIVERSITY
- * DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
- * WASHINGTON OR THE LELAND STANFORD JUNIOR UNIVERSITY BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
-
-#include "base64.h"
-
-
-/* NOTE: This is not true RFC822 anymore. The use of the characters
-   '/', '+', and '=' is no bueno when the ID will be used as part of a URL.
-   '_', '.', and '-' have been used instead
-*/
-
-/* Convert binary contents to BASE64
- * Accepts: source
- *	    length of source
- *	    pointer to return destination length
- * Returns: destination as BASE64
- */
-
-unsigned char *rfc822_binary (void *src,unsigned long srcl,unsigned long *len)
-{
-  unsigned char *ret,*d;
-  unsigned char *s = (unsigned char *) src;
-  char *v = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._";
-  unsigned long i = ((srcl + 2) / 3) * 4;
-  *len = i += 2 * ((i / 60) + 1);
-  d = ret = (unsigned char *) malloc ((size_t) ++i);
-  for (i = 0; srcl; s += 3) {	/* process tuplets */
-    *d++ = v[s[0] >> 2];	/* byte 1: high 6 bits (1) */
-				/* byte 2: low 2 bits (1), high 4 bits (2) */
-    *d++ = v[((s[0] << 4) + (--srcl ? (s[1] >> 4) : 0)) & 0x3f];
-				/* byte 3: low 4 bits (2), high 2 bits (3) */
-    *d++ = srcl ? v[((s[1] << 2) + (--srcl ? (s[2] >> 6) : 0)) & 0x3f] : '-';
-				/* byte 4: low 6 bits (3) */
-    *d++ = srcl ? v[s[2] & 0x3f] : '-';
-    if (srcl) srcl--;		/* count third character if processed */
-    if ((++i) == 15) {		/* output 60 characters? */
-      i = 0;			/* restart line break count, insert CRLF */
-      *d++ = '\015'; *d++ = '\012';
-    }
-  }
-  *d = '\0';			/* tie off string */
-
-  return ret;			/* return the resulting string */
-}
diff --git a/src/input/base64.h b/src/input/base64.h
deleted file mode 100644
index 72feef885..000000000
--- a/src/input/base64.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2000 Robert Kaye
- *
- * This file is part of xine, a free video player.
- *
- * xine 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.
- *
- * xine 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
- *
- * Base64 encoding modified for Musicbrainz
- *   relicensed under the GNU General Public License for use in xine-lib
- *
- */
-/* --------------------------------------------------------------------------
-
-   MusicBrainz -- The Internet music metadatabase
-
-   Copyright (C) 2000 Robert Kaye
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-   
-   This library 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
-   Lesser General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-     $Id: base64.h,v 1.1 2004/05/05 09:11:39 hadess Exp $
-
-----------------------------------------------------------------------------*/
-/*
- * Program:	RFC-822 routines (originally from SMTP)
- *
- * Author:	Mark Crispin
- *		Networks and Distributed Computing
- *		Computing & Communications
- *		University of Washington
- *		Administration Building, AG-44
- *		Seattle, WA  98195
- *		Internet: MRC@CAC.Washington.EDU
- *
- * Date:	27 July 1988
- * Last Edited:	10 September 1998
- *
- * Sponsorship:	The original version of this work was developed in the
- *		Symbolic Systems Resources Group of the Knowledge Systems
- *		Laboratory at Stanford University in 1987-88, and was funded
- *		by the Biomedical Research Technology Program of the National
- *		Institutes of Health under grant number RR-00785.
- *
- * Original version Copyright 1988 by The Leland Stanford Junior University
- * Copyright 1998 by the University of Washington
- *
- *  Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notices appear in all copies and that both the
- * above copyright notices and this permission notice appear in supporting
- * documentation, and that the name of the University of Washington or The
- * Leland Stanford Junior University not be used in advertising or publicity
- * pertaining to distribution of the software without specific, written prior
- * permission.  This software is made available "as is", and
- * THE UNIVERSITY OF WASHINGTON AND THE LELAND STANFORD JUNIOR UNIVERSITY
- * DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
- * WASHINGTON OR THE LELAND STANFORD JUNIOR UNIVERSITY BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#ifndef BASE64_H
-#define BASE64_H
-
-unsigned char *rfc822_binary (void *src,unsigned long srcl,unsigned long *len);
-
-#endif
-- 
cgit v1.2.3


From 9276e56845b6c048cdf1e98574fa8fc80ffe8488 Mon Sep 17 00:00:00 2001
From: Richard van Paasen <rvpaasen@t3i.nl>
Date: Fri, 4 Jan 2008 00:00:08 +0100
Subject: Fixed an issue in input_pvr with setting the frequency of the tuner
 for ivtv versions 0.10.6+

Note: the old code divided the frequency by 62.5. But, the ivtv driver
expects a different format. I changed the implementation in input_pvr such
that the frequency can be given as provided by cable companies, multiplied by
1000: e.g. 503250 for 503.250 MHz.
---
 src/input/input_pvr.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index f07e98133..1b8000072 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1016,19 +1016,21 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
 
       /* change input */
       if (v4l2_data->input != -1 && v4l2_data->input != this->input) {
-        lprintf("change input to:%d\n", v4l2_data->input);
         this->input = v4l2_data->input;
 
         /* as of ivtv 0.10.6: must close and reopen to set input */
         close(this->dev_fd);
         this->dev_fd = open (this->class->devname, O_RDWR);
-        if (this->dev_fd == -1) {
+        if (this->dev_fd < 0) {
           xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
                   "input_pvr: error opening device %s\n", this->class->devname );
         } else {
-          if( ioctl(this->dev_fd, VIDIOC_S_INPUT, &this->input) )
+          if( ioctl(this->dev_fd, VIDIOC_S_INPUT, &this->input) == 0 ) {
+            lprintf("Tuner Input set to:%d\n", v4l2_data->input);
+          } else {
             xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
                     "input_pvr: error setting v4l2 input\n");
+          }
         }
       }
 
@@ -1040,14 +1042,30 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
 
       /* change frequency */
       if (v4l2_data->frequency != -1 && v4l2_data->frequency != this->frequency) {
-        lprintf("changing frequency to:%.2f\n", (float)v4l2_data->frequency * 62.5);
+        double freq = (double)v4l2_data->frequency / 1000.0;
         struct v4l2_frequency vf;
+        struct v4l2_tuner vt;
+        double fac = 16;
+
+        memset(&vf, 0, sizeof(vf));
+        memset(&vt, 0, sizeof(vt));
+
         this->frequency = v4l2_data->frequency;
-        vf.frequency = this->frequency;
+
+        if (ioctl(this->dev_fd, VIDIOC_G_TUNER, &vt) == 0) {
+          fac = (vt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16;
+        }
+
         vf.tuner = 0;
-        if( ioctl(this->dev_fd, VIDIOC_S_FREQUENCY, &vf) )
+        vf.type = vt.type;
+        vf.frequency = (__u32)(freq * fac);
+
+        if (ioctl(this->dev_fd, VIDIOC_S_FREQUENCY, &vf) == 0) {
+          lprintf("Tuner Frequency set to %d (%f.3 MHz)\n", vf.frequency, vf.frequency / fac);
+        } else {
           xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
                   "input_pvr: error setting v4l2 frequency\n");
+        }
       }
 
       pthread_mutex_unlock(&this->dev_lock);
-- 
cgit v1.2.3


From f3e691cf556bd4ad1338f222ffcf5eaecafd6a24 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Fri, 11 Jan 2008 13:49:08 +0000
Subject: Fix a buffer overflow in the RTSP header-handling code.
 CVE-2008-0225; ported from mplayer changeset 22821.

---
 src/input/libreal/rmff.c         | 85 +++++++++++++++++++++++++++++-----------
 src/input/libreal/rmff.h         |  6 +++
 src/input/librtsp/rtsp_session.c |  6 +++
 3 files changed, 75 insertions(+), 22 deletions(-)

(limited to 'src/input')

diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index 159b81ee6..b79eb5e0f 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -35,9 +35,13 @@
  * writes header data to a buffer
  */
 
-static void rmff_dump_fileheader(rmff_fileheader_t *fileheader, char *buffer) {
+static int rmff_dump_fileheader(rmff_fileheader_t *fileheader, uint8_t *buffer, int bufsize) {
+
+  if (!fileheader) return 0;
+
+  if (bufsize < RMFF_FILEHEADER_SIZE)
+    return -1;
 
-  if (!fileheader) return;
   fileheader->object_id=_X_BE_32(&fileheader->object_id);
   fileheader->size=_X_BE_32(&fileheader->size);
   fileheader->object_version=_X_BE_16(&fileheader->object_version);
@@ -53,11 +57,17 @@ static void rmff_dump_fileheader(rmff_fileheader_t *fileheader, char *buffer) {
   fileheader->file_version=_X_BE_32(&fileheader->file_version);
   fileheader->num_headers=_X_BE_32(&fileheader->num_headers);
   fileheader->object_id=_X_BE_32(&fileheader->object_id);
+
+  return RMFF_FILEHEADER_SIZE;
 }
 
-static void rmff_dump_prop(rmff_prop_t *prop, char *buffer) {
+static int rmff_dump_prop(rmff_prop_t *prop, uint8_t *buffer, int bufsize) {
+
+  if (!prop) return 0;
+
+  if (bufsize < RMFF_PROPHEADER_SIZE)
+    return -1;
 
-  if (!prop) return;
   prop->object_id=_X_BE_32(&prop->object_id);
   prop->size=_X_BE_32(&prop->size);
   prop->object_version=_X_BE_16(&prop->object_version);
@@ -93,13 +103,19 @@ static void rmff_dump_prop(rmff_prop_t *prop, char *buffer) {
   prop->num_streams=_X_BE_16(&prop->num_streams);
   prop->flags=_X_BE_16(&prop->flags);
   prop->object_id=_X_BE_32(&prop->object_id);
+
+  return RMFF_PROPHEADER_SIZE;
 }
 
-static void rmff_dump_mdpr(rmff_mdpr_t *mdpr, char *buffer) {
+static int rmff_dump_mdpr(rmff_mdpr_t *mdpr, uint8_t *buffer, int bufsize) {
 
   int s1, s2, s3;
 
-  if (!mdpr) return;
+  if (!mdpr) return 0;
+
+  if (bufsize < RMFF_MDPRHEADER_SIZE + mdpr->type_specific_len + mdpr->stream_name_size + mdpr->mime_type_size)
+    return -1;
+
   mdpr->object_id=_X_BE_32(&mdpr->object_id);
   mdpr->size=_X_BE_32(&mdpr->size);
   mdpr->object_version=_X_BE_16(&mdpr->object_version);
@@ -141,13 +157,19 @@ static void rmff_dump_mdpr(rmff_mdpr_t *mdpr, char *buffer) {
   mdpr->duration=_X_BE_32(&mdpr->duration);
   mdpr->object_id=_X_BE_32(&mdpr->object_id);
 
+  return RMFF_MDPRHEADER_SIZE + s1 + s2 + s3;
 }
 
-static void rmff_dump_cont(rmff_cont_t *cont, char *buffer) {
+static int rmff_dump_cont(rmff_cont_t *cont, uint8_t *buffer, int bufsize) {
 
   int p;
 
-  if (!cont) return;
+  if (!cont) return 0;
+
+  if (bufsize < RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len +
+      cont->copyright_len + cont->comment_len)
+    return -1;
+
   cont->object_id=_X_BE_32(&cont->object_id);
   cont->size=_X_BE_32(&cont->size);
   cont->object_version=_X_BE_16(&cont->object_version);
@@ -181,11 +203,18 @@ static void rmff_dump_cont(rmff_cont_t *cont, char *buffer) {
   cont->size=_X_BE_32(&cont->size);
   cont->object_version=_X_BE_16(&cont->object_version);
   cont->object_id=_X_BE_32(&cont->object_id);
+
+  return RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len +
+         cont->copyright_len + cont->comment_len;
 }
 
-static void rmff_dump_dataheader(rmff_data_t *data, char *buffer) {
+static int rmff_dump_dataheader(rmff_data_t *data, uint8_t *buffer, int bufsize) {
+
+  if (!data) return 0;
+
+  if (bufsize < RMFF_DATAHEADER_SIZE)
+    return -1;
 
-  if (!data) return;
   data->object_id=_X_BE_32(&data->object_id);
   data->size=_X_BE_32(&data->size);
   data->object_version=_X_BE_16(&data->object_version);
@@ -201,31 +230,43 @@ static void rmff_dump_dataheader(rmff_data_t *data, char *buffer) {
   data->size=_X_BE_32(&data->size);
   data->object_version=_X_BE_16(&data->object_version);
   data->object_id=_X_BE_32(&data->object_id);
+
+  return RMFF_DATAHEADER_SIZE;
 }
 
-int rmff_dump_header(rmff_header_t *h, char *buffer, int max) {
+int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max) {
+  uint8_t *buffer = buf_gen;
 
-  int written=0;
+  int written=0, size;
   rmff_mdpr_t **stream=h->streams;
 
-  rmff_dump_fileheader(h->fileheader, &buffer[written]);
-  written+=h->fileheader->size;
-  rmff_dump_prop(h->prop, &buffer[written]);
-  written+=h->prop->size;
-  rmff_dump_cont(h->cont, &buffer[written]);
-  written+=h->cont->size;
+  if ((size=rmff_dump_fileheader(h->fileheader, &buffer[written], max)) < 0)
+    return -1;
+  written+=size;
+  max -= size;
+  if ((size=rmff_dump_prop(h->prop, &buffer[written], max)) < 0)
+    return -1;
+  written+=size;
+  max -= size;
+  if ((size=rmff_dump_cont(h->cont, &buffer[written], max)) < 0)
+    return -1;
+  written+=size;
+  max -= size;
   if (stream)
   {
     while(*stream)
     {
-      rmff_dump_mdpr(*stream, &buffer[written]);
-      written+=(*stream)->size;
+      if ((size=rmff_dump_mdpr(*stream, &buffer[written], max)) < 0)
+        return -1;
+      written+=size;
+      max -= size;
       stream++;
     }
   }
     
-  rmff_dump_dataheader(h->data, &buffer[written]);
-  written+=18;
+  if ((size=rmff_dump_dataheader(h->data, &buffer[written], max)) < 0)
+    return -1;
+  written+=size;
 
   return written;
 }
diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h
index d39942088..5288fc558 100644
--- a/src/input/libreal/rmff.h
+++ b/src/input/libreal/rmff.h
@@ -39,6 +39,12 @@
 
 #define RMFF_HEADER_SIZE 0x12
 
+#define RMFF_FILEHEADER_SIZE 18
+#define RMFF_PROPHEADER_SIZE 50
+#define RMFF_MDPRHEADER_SIZE 46
+#define RMFF_CONTHEADER_SIZE 18
+#define RMFF_DATAHEADER_SIZE 18
+
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
         (((long)(unsigned char)(ch3)       ) | \
         ( (long)(unsigned char)(ch2) << 8  ) | \
diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c
index f3ddb59bc..5b02282e9 100644
--- a/src/input/librtsp/rtsp_session.c
+++ b/src/input/librtsp/rtsp_session.c
@@ -148,6 +148,11 @@ connect:
 	
 	  rtsp_session->header_left = 
     rtsp_session->header_len  = rmff_dump_header(h,rtsp_session->header,HEADER_SIZE);
+    if (rtsp_session->header_len < 0) {
+      xprintf (stream->xine, XINE_VERBOSITY_LOG,
+	       _("rtsp_session: rtsp server returned overly-large headers, session can not be established.\n"));
+      goto session_abort;
+    }
 
     xine_buffer_copyin(rtsp_session->recv, 0, rtsp_session->header, rtsp_session->header_len);
     rtsp_session->recv_size = rtsp_session->header_len;
@@ -157,6 +162,7 @@ connect:
   {
     xprintf(stream->xine, XINE_VERBOSITY_LOG,
 	    _("rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"), server);
+    session_abort:
     rtsp_close(rtsp_session->s);
     free(server);
     xine_buffer_free(rtsp_session->recv);
-- 
cgit v1.2.3


From a9aa9d58524fd95b1babe4a47308b126899c1113 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Fri, 11 Jan 2008 15:21:53 +0000
Subject: Correct the prototype of rmff_dump_header. (Build fix.)

---
 src/input/libreal/rmff.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/input')

diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h
index 5288fc558..b03d12b1b 100644
--- a/src/input/libreal/rmff.h
+++ b/src/input/libreal/rmff.h
@@ -251,7 +251,7 @@ int rmff_get_header_size(rmff_header_t *h);
 /*
  * dumps the header <h> to <buffer>. <max> is the size of <buffer>
  */
-int rmff_dump_header(rmff_header_t *h, char *buffer, int max);
+int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max);
 
 /*
  * dumps a packet header
-- 
cgit v1.2.3


From bc09805e004f1a68d7a632a38ed6309f6c9ec356 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Mon, 14 Jan 2008 23:24:15 +0000
Subject: Change the default v4l device paths to /dev/{video,radio}0.

---
 src/input/input_v4l.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index b43a2684a..34f6a0684 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -91,8 +91,8 @@ static const resolution_t resolutions[] = {
 };
 
 #define NUM_RESOLUTIONS  (sizeof(resolutions)/sizeof(resolutions[0]))
-#define RADIO_DEV        "/dev/v4l/radio0"
-#define VIDEO_DEV        "/dev/v4l/video0"
+#define RADIO_DEV        "/dev/radio0"
+#define VIDEO_DEV        "/dev/video0"
 
 #if !defined(NDELAY) && defined(O_NDELAY)
 #define FNDELAY O_NDELAY
-- 
cgit v1.2.3


From eef1dd9c03642f1abeee307a6786566ce3ef7e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Wed, 16 Jan 2008 19:45:26 +0100
Subject: Remove deprecated unused functions.

---
 src/input/input_dvb.c    |  3 ---
 src/input/input_pnm.c    |  2 --
 src/input/input_rtsp.c   |  2 --
 src/input/net_buf_ctrl.c | 23 -----------------------
 src/input/net_buf_ctrl.h |  6 ------
 5 files changed, 36 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index b3a9d8e46..07aefc362 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -2496,9 +2496,6 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen,
 	  "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len);
 #endif
 
-#ifndef DVB_NO_BUFFERING
-  nbc_check_buffers (this->nbc); 
-#endif
   /* protect against channel changes */
   have_mutex =  pthread_mutex_lock(&this->channel_change_mutex);
   total=0;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 3271a04c9..e11e3b361 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -83,8 +83,6 @@ static off_t pnm_plugin_read (input_plugin_t *this_gen,
 
   lprintf ("pnm_plugin_read: %"PRId64" bytes ...\n", len);
 
-  nbc_check_buffers (this->nbc);
-
   n = pnm_read (this->pnm, buf, len);
   this->curpos += n;
 
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index bee192c0d..e2b1bae99 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -83,8 +83,6 @@ static off_t rtsp_plugin_read (input_plugin_t *this_gen,
 
   lprintf ("rtsp_plugin_read: %"PRId64" bytes ...\n", len);
 
-  nbc_check_buffers (this->nbc);
-
   n = rtsp_session_read (this->rtsp, buf, len);
   this->curpos += n;
 
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index aaf575e40..03a24d38f 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -113,10 +113,6 @@ static void nbc_set_speed_normal (nbc_t *this) {
   stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1);
 }
 
-void nbc_check_buffers (nbc_t *this) {
-  /* Deprecated */
-}
-
 static void display_stats (nbc_t *this) {
   static const char buffering[2][4] = {"   ", "buf"};
   static const char enabled[2][4]   = {"off", "on "};
@@ -564,22 +560,3 @@ void nbc_close (nbc_t *this) {
   free (this);
   xprintf(xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_close: done\n");
 }
-
-
-void nbc_set_high_water_mark(nbc_t *this, int value) {
-/*
-  Deprecated
-  this->high_water_mark = value;
-*/
-  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-	  "\nnet_buf_ctrl: this method is deprecated, please fix the input plugin\n");
-}
-
-void nbc_set_low_water_mark(nbc_t *this, int value) {
-/*
-  Deprecated
-  this->low_water_mark = value;
-*/
-  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-	  "\nnet_buf_ctrl: this method is deprecated, please fix the input plugin\n");
-}
diff --git a/src/input/net_buf_ctrl.h b/src/input/net_buf_ctrl.h
index c35187179..87d6d84a1 100644
--- a/src/input/net_buf_ctrl.h
+++ b/src/input/net_buf_ctrl.h
@@ -29,12 +29,6 @@ typedef struct nbc_s nbc_t;
 
 nbc_t *nbc_init (xine_stream_t *xine);
 
-void nbc_check_buffers (nbc_t *this);
-
 void nbc_close (nbc_t *this);
 
-void nbc_set_high_water_mark(nbc_t *this, int value);
-
-void nbc_set_low_water_mark(nbc_t *this, int value);
-
 #endif
-- 
cgit v1.2.3


From abef42f0fb968e8489b2ac46963530ab81e2f3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Wed, 16 Jan 2008 19:49:58 +0100
Subject: Make _x_canonicalise_url an inline function, as it's only ever used
 once (either in input_http or in the test for http_helper).

---
 src/input/http_helper.c | 23 -----------------------
 src/input/http_helper.h | 24 +++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'src/input')

diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index 83562c9dc..f4950a084 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -220,29 +220,6 @@ error:
   return 0;  
 }
 
-char *_x_canonicalise_url (const char *base, const char *url) {
-
-  size_t base_length;
-  char *cut, *ret;
-
-  if ((cut = strstr (url, "://")))
-    return strdup (url);
-
-  cut = strstr (base, "://");
-  if (url[0] == '/') {
-    /* absolute - base up to first '/' after "://", then url */
-    cut = strchr (cut + 3, '/');
-  }
-  else {
-    /* relative - base up to & inc. last '/', then url */
-    cut = strrchr (cut, '/');
-    if (cut)
-      ++cut;
-  }
-  base_length = cut ? (size_t)(cut - base) : strlen (base);
-  asprintf (&ret, "%.*s%s", (int)base_length, base, url);
-  return ret;
-}
 
 #ifdef TEST_URL
 /*
diff --git a/src/input/http_helper.h b/src/input/http_helper.h
index 3ce3f2b7c..9baa05235 100644
--- a/src/input/http_helper.h
+++ b/src/input/http_helper.h
@@ -43,6 +43,28 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
  * return:
  *   the canonicalised URL (caller must free() it)
  */
-char *_x_canonicalise_url (const char *base, const char *url);
+static inline char *_x_canonicalise_url (const char *base, const char *url) {
+
+  size_t base_length;
+  char *cut, *ret;
+
+  if ((cut = strstr (url, "://")))
+    return strdup (url);
+
+  cut = strstr (base, "://");
+  if (url[0] == '/') {
+    /* absolute - base up to first '/' after "://", then url */
+    cut = strchr (cut + 3, '/');
+  }
+  else {
+    /* relative - base up to & inc. last '/', then url */
+    cut = strrchr (cut, '/');
+    if (cut)
+      ++cut;
+  }
+  base_length = cut ? (size_t)(cut - base) : strlen (base);
+  asprintf (&ret, "%.*s%s", (int)base_length, base, url);
+  return ret;
+}
 
 #endif /* HTTP_HELPER_H */
-- 
cgit v1.2.3


From 1adcc214c14fb6d8a5c78ff62e4bb16f1c1d1e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Wed, 16 Jan 2008 20:00:50 +0100
Subject: Put under #if 0 a few functions that never gets used in xine at all.

---
 src/input/libreal/rmff.c | 6 ++++++
 src/input/libreal/rmff.h | 6 ++++++
 src/input/librtsp/rtsp.c | 6 ++++++
 src/input/librtsp/rtsp.h | 6 ++++++
 4 files changed, 24 insertions(+)

(limited to 'src/input')

diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index 0e803e4d4..1600e967a 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -475,6 +475,7 @@ rmff_header_t *rmff_scan_header(const char *data) {
 	return header;
 }
 
+#if 0
 rmff_header_t *rmff_scan_header_stream(int fd) {
 
   rmff_header_t *header;
@@ -525,6 +526,7 @@ void rmff_scan_pheader(rmff_pheader_t *h, char *data) {
   h->reserved=(uint8_t)data[10];
   h->flags=(uint8_t)data[11];
 }
+#endif
 
 rmff_fileheader_t *rmff_new_fileheader(uint32_t num_headers) {
 
@@ -670,6 +672,7 @@ rmff_data_t *rmff_new_dataheader(uint32_t num_packets, uint32_t next_data_header
   return data;
 }
   
+#if 0
 void rmff_print_header(rmff_header_t *h) {
 
   rmff_mdpr_t **stream;
@@ -736,6 +739,7 @@ void rmff_print_header(rmff_header_t *h) {
     printf("next DATA : 0x%08x\n", h->data->next_data_header);
   } 
 }
+#endif
 
 void rmff_fix_header(rmff_header_t *h) {
 
@@ -844,6 +848,7 @@ void rmff_fix_header(rmff_header_t *h) {
   }
 }
 
+#if 0
 int rmff_get_header_size(rmff_header_t *h) {
 
   if (!h) return 0;
@@ -883,3 +888,4 @@ void rmff_free_header(rmff_header_t *h) {
   }
   free(h);
 }
+#endif
diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h
index 2521ebda6..3fe3af284 100644
--- a/src/input/libreal/rmff.h
+++ b/src/input/libreal/rmff.h
@@ -222,6 +222,7 @@ rmff_data_t *rmff_new_dataheader(
  */
 rmff_header_t *rmff_scan_header(const char *data);
 
+#if 0
 /*
  * scans a data packet header. Notice, that this function does not allocate
  * the header struct itself.
@@ -237,16 +238,19 @@ rmff_header_t *rmff_scan_header_stream(int fd);
  * prints header information in human readible form to stdout
  */
 void rmff_print_header(rmff_header_t *h);
+#endif
 
 /*
  * does some checks and fixes header if possible
  */
 void rmff_fix_header(rmff_header_t *h);
 
+#if 0
 /*
  * returns the size of the header (incl. first data-header)
  */
 int rmff_get_header_size(rmff_header_t *h);
+#endif
  
 /*
  * dumps the header <h> to <buffer>. <max> is the size of <buffer>
@@ -258,9 +262,11 @@ int rmff_dump_header(rmff_header_t *h, void *buffer, int max);
  */
 void rmff_dump_pheader(rmff_pheader_t *h, uint8_t *data);
 
+#if 0
 /*
  * frees a header struct
  */
 void rmff_free_header(rmff_header_t *h);
+#endif
 
 #endif
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index cd844654b..c660751fe 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -359,12 +359,14 @@ int rtsp_request_play(rtsp_t *s, const char *what) {
   return rtsp_get_answers(s);
 }
 
+#if 0
 int rtsp_request_tearoff(rtsp_t *s, const char *what) {
 
   rtsp_send_request(s,"TEAROFF",what);
   
   return rtsp_get_answers(s);
 }
+#endif
 
 /*
  * read opaque data from stream
@@ -557,6 +559,7 @@ char *rtsp_search_answers(rtsp_t *s, const char *tag) {
   return NULL;
 }
 
+#if 0
 /*
  * session id management
  */
@@ -574,6 +577,7 @@ char *rtsp_get_session(rtsp_t *s) {
   return s->session;
 
 }
+#endif
 
 char *rtsp_get_mrl(rtsp_t *s) {
 
@@ -597,6 +601,7 @@ void rtsp_schedule_field(rtsp_t *s, const char *string) {
   s->scheduled[i]=strdup(string);
 }
 
+#if 0
 /*
  * removes the first scheduled field which prefix matches string. 
  */
@@ -617,6 +622,7 @@ void rtsp_unschedule_field(rtsp_t *s, const char *string) {
     *(ptr-1)=*ptr;
   } while(*ptr);
 }
+#endif
 
 /*
  * unschedule all fields
diff --git a/src/input/librtsp/rtsp.h b/src/input/librtsp/rtsp.h
index 3c829e2e8..1cec57e1e 100644
--- a/src/input/librtsp/rtsp.h
+++ b/src/input/librtsp/rtsp.h
@@ -47,7 +47,9 @@ int rtsp_request_describe(rtsp_t *s, const char *what);
 int rtsp_request_setup(rtsp_t *s, const char *what);
 int rtsp_request_setparameter(rtsp_t *s, const char *what);
 int rtsp_request_play(rtsp_t *s, const char *what);
+#if 0
 int rtsp_request_tearoff(rtsp_t *s, const char *what);
+#endif
 
 int rtsp_send_ok(rtsp_t *s);
 
@@ -61,15 +63,19 @@ void rtsp_free_answers(rtsp_t *this);
 int      rtsp_read (rtsp_t *this, char *data, int len);
 void     rtsp_close (rtsp_t *this);
 
+#if 0
 void  rtsp_set_session(rtsp_t *s, const char *id);
 char *rtsp_get_session(rtsp_t *s);
+#endif
 
 char *rtsp_get_mrl(rtsp_t *s);
 
 /*int      rtsp_peek_header (rtsp_t *this, char *data); */
 
 void rtsp_schedule_field(rtsp_t *s, const char *string);
+#if 0
 void rtsp_unschedule_field(rtsp_t *s, const char *string);
+#endif
 void rtsp_unschedule_all(rtsp_t *s);
 
 #endif
-- 
cgit v1.2.3


From c018c8408df06dcf47c2c924e0b88a6a048573de Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sat, 26 Jan 2008 17:42:56 +0000
Subject: Quick hack to allow configuration of the V4L ALSA audio input device.

---
 src/input/input_v4l.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 34f6a0684..d0558b492 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -93,6 +93,9 @@ static const resolution_t resolutions[] = {
 #define NUM_RESOLUTIONS  (sizeof(resolutions)/sizeof(resolutions[0]))
 #define RADIO_DEV        "/dev/radio0"
 #define VIDEO_DEV        "/dev/video0"
+#ifdef HAVE_ALSA
+#define AUDIO_DEV	 "plughw:0,0"
+#endif
 
 #if !defined(NDELAY) && defined(O_NDELAY)
 #define FNDELAY O_NDELAY
@@ -1701,6 +1704,9 @@ static input_plugin_t *v4l_class_get_instance (input_class_t *cls_gen,
 {
   /* v4l_input_class_t  *cls = (v4l_input_class_t *) cls_gen; */
   v4l_input_plugin_t *this;
+#ifdef HAVE_ALSA
+  cfg_entry_t        *entry;
+#endif
   char               *mrl     = strdup(data);
   
   /* Example mrl:  v4l:/Television/62500 */
@@ -1721,13 +1727,14 @@ static input_plugin_t *v4l_class_get_instance (input_class_t *cls_gen,
   this->event_queue   = NULL;
   this->scr           = NULL;
 #ifdef HAVE_ALSA
-  this->pcm_name      = NULL;
   this->pcm_data      = NULL;
   this->pcm_hwparams  = NULL;
   
   /* Audio */
   this->pcm_stream    = SND_PCM_STREAM_CAPTURE;
-  this->pcm_name      = strdup("plughw:0,0");
+  entry = this->stream->xine->config->lookup_entry(this->stream->xine->config,
+                                                   "media.video4linux.audio_device");
+  this->pcm_name      = strdup (entry->str_value);
   this->audio_capture = 1;
 #endif
   this->rate          = 44100;
@@ -1910,7 +1917,15 @@ static void *init_video_class (xine_t *xine, void *data)
 			   _("v4l video device"),
 			   _("The path to your Video4Linux video device."),
 			   10, NULL, NULL);
-  
+#ifdef HAVE_ALSA
+  config->register_filename (config, "media.video4linux.audio_device",
+			   AUDIO_DEV, 0,
+			   _("v4l ALSA audio input device"),
+			   _("The name of the audio device which corresponds "
+			     "to your Video4Linux video device."),
+			   10, NULL, NULL);
+#endif  
+
   return this;
 }
 
-- 
cgit v1.2.3


From d3801a2f741ac6931824bfef41ea0e7c39aa193d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 27 Jan 2008 13:52:33 +0100
Subject: Move base64 header to xine-utils as we don't want it installed.

--HG--
rename : include/xine/base64.h => src/xine-utils/base64.h
---
 src/input/input_cdda.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 0e378c299..e2c32d509 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -69,6 +69,7 @@
 #include <xine/xineutils.h>
 #include <xine/input_plugin.h>
 #include "media_helper.h"
+#include "base64.h"
 
 #if defined(__sun)
 #define	DEFAULT_CDDA_DEVICE	"/vol/dev/aliases/cdrom0"
-- 
cgit v1.2.3


From 7c166d8088e0a128a7b223c62fd2b8dc1a1b70c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 27 Jan 2008 13:58:31 +0100
Subject: Rename base64 functions to _x_ as they should not be part of the
 public API. Note that these will be removed as soon as -libavutil branch is
 merged, in favour of libavutil's base64 implementation.

---
 src/input/input_cdda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index e2c32d509..64495c433 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -1936,7 +1936,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) {
 
   sha_final(digest, &sha);
 
-  base64 = xine_rfc822_binary(digest, 20, &size);
+  base64 = _x_rfc822_binary(digest, 20, &size);
   base64[size] = 0;
 
   _x_meta_info_set_utf8(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64);
-- 
cgit v1.2.3


From b5f4ef58160be1126dd5226f89fd704b24006760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 27 Jan 2008 16:07:42 +0100
Subject: Remove another recursive make invocation, build the vcd plugin inside
 src/input even if the source files are in src/input/vcd.

---
 src/input/Makefile.am     | 17 ++++++++++++-----
 src/input/vcd/Makefile.am | 13 -------------
 2 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 src/input/vcd/Makefile.am

(limited to 'src/input')

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index ca7e6dabd..64ba0ce54 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -11,9 +11,6 @@ AM_LDFLAGS = $(xineplug_ldflags)
 #
 
 SUBDIRS = libreal librtsp
-if ENABLE_VCD
-SUBDIRS += vcd
-endif
 if !WITH_EXTERNAL_DVDNAV
 SUBDIRS += libdvdnav
 endif
@@ -21,13 +18,16 @@ endif
 
 noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h
 
-
 if ENABLE_DVB
 in_dvb = xineplug_inp_dvb.la
 endif
 
+if ENABLE_VCD
+in_vcd = xineplug_inp_vcd.la
+endif
+
 if ENABLE_VCDO
-in_vcd = xineplug_inp_vcdo.la
+in_vcdo = xineplug_inp_vcdo.la
 endif
 
 if ENABLE_V4L
@@ -62,6 +62,7 @@ xineplug_LTLIBRARIES = \
 	xineplug_inp_http.la \
 	xineplug_inp_dvd.la \
 	$(in_vcd) \
+	$(in_vcdo) \
 	$(in_v4l) \
 	$(in_gnome_vfs) \
 	$(in_smb) \
@@ -92,6 +93,12 @@ xineplug_inp_mms_la_LIBADD = $(XINE_LIB) $(LTLIBICONV) $(PTHREAD_LIBS) $(LTLIBIN
 xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
 xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
 
+xineplug_inp_vcd_la_SOURCES = vcd/xineplug_inp_vcd.c vcd/vcdplayer.c	\
+	                      vcd/vcdio.c vcd/xine-extra.c vcd/vcdio.h	\
+	                      vcd/vcdplayer.h vcd/xine-extra.h
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
+xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
+
 xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
 xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
 
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
deleted file mode 100644
index 2b47415fd..000000000
--- a/src/input/vcd/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_LDFLAGS = $(xineplug_ldflags)
-
-noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
-
-xineplug_LTLIBRARIES = xineplug_inp_vcd.la
-
-xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
-xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS) $(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS)
-xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-- 
cgit v1.2.3


From 72abc5e53ea918cdf2813a722e14760d8e797b3d Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Fri, 1 Feb 2008 00:01:12 +0000
Subject: Back out vcd build changes: separate unit (though used only once).
 Also, built files don't end up in the vcd directory.

---
 src/input/Makefile.am     | 17 +++++------------
 src/input/vcd/Makefile.am | 13 +++++++++++++
 2 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 src/input/vcd/Makefile.am

(limited to 'src/input')

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 64ba0ce54..ca7e6dabd 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -11,6 +11,9 @@ AM_LDFLAGS = $(xineplug_ldflags)
 #
 
 SUBDIRS = libreal librtsp
+if ENABLE_VCD
+SUBDIRS += vcd
+endif
 if !WITH_EXTERNAL_DVDNAV
 SUBDIRS += libdvdnav
 endif
@@ -18,16 +21,13 @@ endif
 
 noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h
 
+
 if ENABLE_DVB
 in_dvb = xineplug_inp_dvb.la
 endif
 
-if ENABLE_VCD
-in_vcd = xineplug_inp_vcd.la
-endif
-
 if ENABLE_VCDO
-in_vcdo = xineplug_inp_vcdo.la
+in_vcd = xineplug_inp_vcdo.la
 endif
 
 if ENABLE_V4L
@@ -62,7 +62,6 @@ xineplug_LTLIBRARIES = \
 	xineplug_inp_http.la \
 	xineplug_inp_dvd.la \
 	$(in_vcd) \
-	$(in_vcdo) \
 	$(in_v4l) \
 	$(in_gnome_vfs) \
 	$(in_smb) \
@@ -93,12 +92,6 @@ xineplug_inp_mms_la_LIBADD = $(XINE_LIB) $(LTLIBICONV) $(PTHREAD_LIBS) $(LTLIBIN
 xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
 xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
 
-xineplug_inp_vcd_la_SOURCES = vcd/xineplug_inp_vcd.c vcd/vcdplayer.c	\
-	                      vcd/vcdio.c vcd/xine-extra.c vcd/vcdio.h	\
-	                      vcd/vcdplayer.h vcd/xine-extra.h
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
-xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-
 xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
 xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL)
 
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
new file mode 100644
index 000000000..2b47415fd
--- /dev/null
+++ b/src/input/vcd/Makefile.am
@@ -0,0 +1,13 @@
+include $(top_srcdir)/misc/Makefile.common
+
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
+
+noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
+
+xineplug_LTLIBRARIES = xineplug_inp_vcd.la
+
+xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
+xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
+xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS) $(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS)
+xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
-- 
cgit v1.2.3