summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-02 22:35:57 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-02 22:35:57 +0000
commita251dc779c6eaf0d29b126b02877fc10838aaec0 (patch)
tree364c90119fea42cd28016305b7768696243dc680 /include
parent852aff94b4586982ff33bf21471cda90124a65bf (diff)
parentefaeb575230625611f3f5fc1f9eae2b36d375fea (diff)
downloadxine-lib-a251dc779c6eaf0d29b126b02877fc10838aaec0.tar.gz
xine-lib-a251dc779c6eaf0d29b126b02877fc10838aaec0.tar.bz2
Merge from 1.1.
--HG-- rename : include/xine.h.in => include/xine.h rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
Diffstat (limited to 'include')
-rw-r--r--include/xine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xine.h b/include/xine.h
index b4573bf73..d92c48077 100644
--- a/include/xine.h
+++ b/include/xine.h
@@ -1860,7 +1860,7 @@ typedef struct {
typedef struct {
int alternative; /* alternative playlist number, usually 0 */
char mrl[1]; /* might (will) be longer */
-} xine_mrl_reference_data_t;
+} xine_mrl_reference_data_t XINE_DEPRECATED;
typedef struct {
int alternative; /* as above */