diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-22 21:00:56 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-22 21:00:56 +0100 |
| commit | 4e9a84a12a49c7a5242d4e372e5961e418ff18df (patch) | |
| tree | 7480c4193fbf0386c66ef240a6805a3d93f9963c /src/xine-engine/xine.c | |
| parent | 9b3fc5f500954e2deb241c17b0437ec8afad025e (diff) | |
| parent | 3a217974c83b61f59a8a86684802864d4f9e03d6 (diff) | |
| download | xine-lib-4e9a84a12a49c7a5242d4e372e5961e418ff18df.tar.gz xine-lib-4e9a84a12a49c7a5242d4e372e5961e418ff18df.tar.bz2 | |
Merge -headers-reshuffle branch into main.
--HG--
rename : src/xine-engine/osd.h => include/xine/osd.h
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 6d6e05b19..ec2dc9170 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -58,21 +58,21 @@ #define XINE_ENGINE_INTERNAL #define METRONOM_CLOCK_INTERNAL -#include "xine_internal.h" -#include "plugin_catalog.h" -#include "audio_out.h" -#include "video_out.h" -#include "demuxers/demux.h" -#include "buffer.h" -#include "spu_decoder.h" -#include "input/input_plugin.h" -#include "metronom.h" -#include "configfile.h" -#include "osd.h" -#include "spu.h" - -#include "xineutils.h" -#include "compat.h" +#include <xine/xine_internal.h> +#include <xine/plugin_catalog.h> +#include <xine/audio_out.h> +#include <xine/video_out.h> +#include <xine/demux.h> +#include <xine/buffer.h> +#include <xine/spu_decoder.h> +#include <xine/input_plugin.h> +#include <xine/metronom.h> +#include <xine/configfile.h> +#include <xine/osd.h> +#include <xine/spu.h> + +#include <xine/xineutils.h> +#include <xine/compat.h> #ifdef WIN32 # include <fcntl.h> |