diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 00:37:48 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 00:37:48 +0100 |
| commit | 1dda55c79b90c27303628a42c7ad8d948d613146 (patch) | |
| tree | fad68e0e7513130582e28cf05d4ceff413f5343c /src/video_out/xcbosd.h | |
| parent | d23cc6dbac6f2b212d99453fddc0f20ccd178ab4 (diff) | |
| parent | dca820a7cb6f1087f6d29482a1ee6d4916fc9f71 (diff) | |
| download | xine-lib-1dda55c79b90c27303628a42c7ad8d948d613146.tar.gz xine-lib-1dda55c79b90c27303628a42c7ad8d948d613146.tar.bz2 | |
Merge from 1.2 main branch.
--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c
Diffstat (limited to 'src/video_out/xcbosd.h')
| -rw-r--r-- | src/video_out/xcbosd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_out/xcbosd.h b/src/video_out/xcbosd.h index 32af4965e..1d4fd1c3a 100644 --- a/src/video_out/xcbosd.h +++ b/src/video_out/xcbosd.h @@ -29,7 +29,7 @@ #ifndef XCBOSD_H #define XCBOSD_H -#include "vo_scale.h" +#include <xine/vo_scale.h> typedef struct xcbosd xcbosd; enum xcbosd_mode {XCBOSD_SHAPED, XCBOSD_COLORKEY}; |