summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2008-01-03 10:59:12 +0000
committerphintuka <phintuka>2008-01-03 10:59:12 +0000
commit1e86cc774f9fda4743b552d6e7ee9a40d07af26e (patch)
tree20e90419c92045a0a2d537a375ebaa68ab616a51
parent556cb85758399ffd9d2648e50116307d3ef8dbef (diff)
downloadxineliboutput-1e86cc774f9fda4743b552d6e7ee9a40d07af26e.tar.gz
xineliboutput-1e86cc774f9fda4743b552d6e7ee9a40d07af26e.tar.bz2
Store slave stream in frontend data
-rw-r--r--xine_fbfe_frontend.c6
-rw-r--r--xine_sxfe_frontend.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c
index 0316aaaf..f76e3c9f 100644
--- a/xine_fbfe_frontend.c
+++ b/xine_fbfe_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_fbfe_frontend.c,v 1.17 2007-05-18 15:49:02 phintuka Exp $
+ * $Id: xine_fbfe_frontend.c,v 1.18 2008-01-03 10:59:12 phintuka Exp $
*
*/
@@ -35,6 +35,9 @@
#include <jpeglib.h>
#undef boolean
+/* framegrab ports */
+#define XINE_ENABLE_EXPERIMENTAL_FEATURES
+
#include <xine.h>
#ifndef XINE_ENGINE_INTERNAL
# define XINE_ENGINE_INTERNAL
@@ -69,6 +72,7 @@ typedef struct fbfe_t {
/* xine stuff */
xine_t *xine;
xine_stream_t *stream;
+ xine_stream_t *slave_stream;
input_plugin_t *input;
xine_video_port_t *video_port;
xine_video_port_t *video_port_none;
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index c719ce1d..a614b06e 100644
--- a/xine_sxfe_frontend.c
+++ b/xine_sxfe_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_sxfe_frontend.c,v 1.30 2007-12-19 20:18:37 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.31 2008-01-03 10:59:12 phintuka Exp $
*
*/
@@ -119,6 +119,7 @@ typedef struct sxfe_s {
/* xine stuff */
xine_t *xine;
xine_stream_t *stream;
+ xine_stream_t *slave_stream;
input_plugin_t *input;
xine_video_port_t *video_port;
xine_video_port_t *video_port_none;