[MPlayer-cvslog] r31419 - in trunk: libao2/ao_ivtv.c libvo/vo_ivtv.c libvo/vo_ivtv.h

[diego]

Author: diego
Date: Mon Jun 14 17:48:39 2010
New Revision: 31419

Log:
Add header for ivtv_write() instead of forward declaring it.

Added:
   trunk/libvo/vo_ivtv.h
Modified:
   trunk/libao2/ao_ivtv.c
   trunk/libvo/vo_ivtv.c

Modified: trunk/libao2/ao_ivtv.c
==============================================================================
--- trunk/libao2/ao_ivtv.c	Mon Jun 14 17:43:47 2010	(r31418)
+++ trunk/libao2/ao_ivtv.c	Mon Jun 14 17:48:39 2010	(r31419)
@@ -36,6 +36,7 @@
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
 #include "libmpdemux/mpeg_packetizer.h"
+#include "libvo/vo_ivtv.h"
 
 #define MPEG_AUDIO_ID 0x1C0
 
@@ -147,8 +148,6 @@ get_space (void)
 static int
 play (void *data, int len, int flags)
 {
-  int ivtv_write (const unsigned char *data, int len);
-
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
 

Modified: trunk/libvo/vo_ivtv.c
==============================================================================
--- trunk/libvo/vo_ivtv.c	Mon Jun 14 17:43:47 2010	(r31418)
+++ trunk/libvo/vo_ivtv.c	Mon Jun 14 17:48:39 2010	(r31419)
@@ -46,6 +46,7 @@
 #include "subopt-helper.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "vo_ivtv.h"
 #include "libmpdemux/mpeg_packetizer.h"
 
 #define DEFAULT_MPEG_DECODER "/dev/video16"

Added: trunk/libvo/vo_ivtv.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libvo/vo_ivtv.h	Mon Jun 14 17:48:39 2010	(r31419)
@@ -0,0 +1,32 @@
+/*
+ * video output for WinTV PVR-150/250/350 (a.k.a IVTV) cards
+ * TV-Out through hardware MPEG decoder
+ * Based on some old code from ivtv driver authors.
+ * See http://ivtvdriver.org/index.php/Main_Page for more details on the
+ * cards supported by the ivtv driver.
+ *
+ * Copyright (C) 2006 Benjamin Zores
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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.
+ *
+ * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_VO_IVTV_H
+#define MPLAYER_VO_IVTV_H
+
+int ivtv_write(const unsigned char *data, int len);
+
+#endif /* MPLAYER_VO_IVTV_H */