summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Vogler <cvogler@users.sourceforge.net>2002-04-27 23:31:33 +0000
committerChristian Vogler <cvogler@users.sourceforge.net>2002-04-27 23:31:33 +0000
commit8d05f52e853822cd60e09422f86248d6219e86d2 (patch)
treee9e8a3976041c1096fc793cd6a58c455ac615ada
parent4a6395e90d6bb701e8c41dd4b9f7ef0709e1d0b0 (diff)
downloadxine-lib-8d05f52e853822cd60e09422f86248d6219e86d2.tar.gz
xine-lib-8d05f52e853822cd60e09422f86248d6219e86d2.tar.bz2
add closed caption buffer type, so the CC decoder is not discarded
immediately after being loaded. CVS patchset: 1789 CVS date: 2002/04/27 23:31:33
-rw-r--r--src/libspucc/xine_decoder.c7
-rw-r--r--src/xine-engine/buffer.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c
index bcfe5ad74..5c097783f 100644
--- a/src/libspucc/xine_decoder.c
+++ b/src/libspucc/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.10 2002/04/27 23:00:40 cvogler Exp $
+ * $Id: xine_decoder.c,v 1.11 2002/04/27 23:31:33 cvogler Exp $
*
* closed caption spu decoder. receive data by events.
*
@@ -281,9 +281,8 @@ void spucc_notify_frame_change(spucc_decoder_t *this, int width, int height)
/*------------------- implementation of spudec interface -------------------*/
static int spudec_can_handle (spu_decoder_t *this_gen, int buf_type) {
- /*int type = buf_type & 0xFFFF0000;
- return (type == BUF_SPU_TEXT); */
- return 0;
+ int type = buf_type & 0xFFFF0000;
+ return (type == BUF_SPU_CC);
}
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 98d1de436..086234768 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.42 2002/04/20 20:20:44 guenter Exp $
+ * $Id: buffer.h,v 1.43 2002/04/27 23:31:33 cvogler Exp $
*
*
* contents:
@@ -135,6 +135,7 @@ extern "C" {
#define BUF_SPU_SUBP_CONTROL 0x04020000
#define BUF_SPU_NAV 0x04030000
#define BUF_SPU_TEXT 0x04040000
+#define BUF_SPU_CC 0x04050000
/* demuxer block types: */