summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-20 13:18:17 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-20 13:18:17 +0100
commit17c9a01cbafd5ff0e6645f96f8ac084fbf239e4d (patch)
treef8bbe29f4b5b0464bdf83ed6cab05497a55955ec /include
parenta78cd0f86f650fd566337d9abb86eedc51e3e699 (diff)
parente8d0ebf629763d195cdc6675f952f479bcedb6c7 (diff)
downloadxine-lib-17c9a01cbafd5ff0e6645f96f8ac084fbf239e4d.tar.gz
xine-lib-17c9a01cbafd5ff0e6645f96f8ac084fbf239e4d.tar.bz2
Merge from 1.1.
--HG-- rename : src/input/input_plugin.h => include/xine/input_plugin.h
Diffstat (limited to 'include')
-rw-r--r--include/xine/input_plugin.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index 2ee9c6e74..2a75d7f9b 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -321,6 +321,13 @@ struct input_plugin_s {
#define INPUT_OPTIONAL_DATA_SPULANG 3
#define INPUT_OPTIONAL_DATA_PREVIEW 7
+/* buffer is a const char **; the string is freed by the input plugin. */
+#define INPUT_OPTIONAL_DATA_MIME_TYPE 8
+/* buffer is unused; true if the demuxer should be determined by the MIME type */
+#define INPUT_OPTIONAL_DATA_DEMUX_MIME_TYPE 9
+/* buffer is a const char **; the string is static or freed by the input plugin. */
+#define INPUT_OPTIONAL_DATA_DEMUXER 10
+
#define MAX_MRL_ENTRIES 255
#define MAX_PREVIEW_SIZE 4096