summaryrefslogtreecommitdiff
path: root/src/xine-engine/buffer.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-08-27 21:07:31 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-08-27 21:07:31 +0000
commit9e4f77e44c96cf4ff4e0186e645dbe08b1e80761 (patch)
treed873d937523e09226f4544aa6dff447d95752985 /src/xine-engine/buffer.h
parente46ac635c2c28d80706f02f239bb847c7e48c34b (diff)
downloadxine-lib-9e4f77e44c96cf4ff4e0186e645dbe08b1e80761.tar.gz
xine-lib-9e4f77e44c96cf4ff4e0186e645dbe08b1e80761.tar.bz2
generic mechanism for specifying subtitles encoding at demuxer level
fixes problems with matroska utf-8 subtitles CVS patchset: 6911 CVS date: 2004/08/27 21:07:31
Diffstat (limited to 'src/xine-engine/buffer.h')
-rw-r--r--src/xine-engine/buffer.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 9295356b4..d0a850ee2 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.140 2004/07/14 01:18:47 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.141 2004/08/27 21:07:31 miguelfreitas Exp $
*
*
* contents:
@@ -426,8 +426,16 @@ struct buf_element_s {
*/
#define BUF_SPECIAL_LPCM_CONFIG 6
-
-/* special buffer type 7 used to be defined but is now available for use */
+/*
+ * In a BUF_SPECIAL_CHARSET_ENCODING buffer:
+ * decoder_info[1] = BUF_SPECIAL_CHARSET_ENCODING
+ * decoder_info[2] = size of charset encoding string
+ * decoder_info_ptr[2] = pointer to charset encoding string
+ * This is used mostly with subtitle buffers when encoding is
+ * known at demuxer level (take precedence over xine config
+ * settings such as misc.spu_src_encoding)
+ */
+#define BUF_SPECIAL_CHARSET_ENCODING 7
/*