diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:04:37 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-05 00:04:37 +0100 |
| commit | 6a2b53c22febcbc2041d760dccd795f388bc10c4 (patch) | |
| tree | de97a08e2986472c6ce9a93fe92ca61d715edf2c /include/xine | |
| parent | 5be586e3025e72c1a1cef2a3ada6238486f7ed43 (diff) | |
| parent | 10d79495d21c47a6c890d501d461b62cb46081e1 (diff) | |
| download | xine-lib-6a2b53c22febcbc2041d760dccd795f388bc10c4.tar.gz xine-lib-6a2b53c22febcbc2041d760dccd795f388bc10c4.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'include/xine')
| -rw-r--r-- | include/xine/xine_internal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h index 9a7a7fee3..7064539ab 100644 --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -47,9 +47,6 @@ extern "C" { #include <xine/io_helper.h> #include <xine/info_helper.h> #include <xine/alphablend.h> -#ifdef XINE_COMPILE -# include "xine_private.h" -#endif #define XINE_MAX_EVENT_LISTENERS 50 #define XINE_MAX_EVENT_TYPES 100 |