summaryrefslogtreecommitdiff
path: root/xine/BluRay/input_bluray.c
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-11-09 12:49:12 +0000
committerphintuka <phintuka>2009-11-09 12:49:12 +0000
commit4db6fda0f601a6b298719cdb11fe3788a3d47c5a (patch)
tree11a42f208507ade54304fe36d4e80b9485e30e51 /xine/BluRay/input_bluray.c
parent4ed8b5a12cf84d300090f8493ab6ae75aa1184a3 (diff)
downloadxineliboutput-4db6fda0f601a6b298719cdb11fe3788a3d47c5a.tar.gz
xineliboutput-4db6fda0f601a6b298719cdb11fe3788a3d47c5a.tar.bz2
get_optional_data(): Added INPUT_OPTIONAL_DATA_DEMUXER.
This should fix mpeg_block demuxer segfault when starting xine ...
Diffstat (limited to 'xine/BluRay/input_bluray.c')
-rw-r--r--xine/BluRay/input_bluray.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/xine/BluRay/input_bluray.c b/xine/BluRay/input_bluray.c
index b25cbffa..776e7ee9 100644
--- a/xine/BluRay/input_bluray.c
+++ b/xine/BluRay/input_bluray.c
@@ -261,6 +261,14 @@ static int bluray_plugin_get_optional_data (input_plugin_t *this_gen, void *data
switch (data_type) {
+ case INPUT_OPTIONAL_DATA_DEMUXER:
+#ifdef HAVE_CONFIG_H
+ *(const char **)data = "mpeg-ts";
+#else
+ *(const char **)data = "mpeg-ts-hdmv";
+#endif
+ return INPUT_OPTIONAL_SUCCESS;
+
/*
* audio track language:
* - channel number can be mpeg-ts PID (0x1100 ... 0x11ff)