diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /include/xine/osd.h | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'include/xine/osd.h')
| -rw-r--r-- | include/xine/osd.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/xine/osd.h b/include/xine/osd.h index ed4e2434b..4e34030ee 100644 --- a/include/xine/osd.h +++ b/include/xine/osd.h @@ -27,11 +27,7 @@ # include <iconv.h> #endif -#ifdef XINE_COMPILE -# include "video_overlay.h" -#else -# include <xine/video_overlay.h> -#endif +#include <xine/video_overlay.h> typedef struct osd_object_s osd_object_t; typedef struct osd_renderer_s osd_renderer_t; |