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/vo_scale.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/vo_scale.h')
| -rw-r--r-- | include/xine/vo_scale.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/xine/vo_scale.h b/include/xine/vo_scale.h index e502b2f62..686d53c22 100644 --- a/include/xine/vo_scale.h +++ b/include/xine/vo_scale.h @@ -33,11 +33,7 @@ extern "C" { #include "config.h" #endif -#ifdef XINE_COMPILE -# include "configfile.h" -#else -# include <xine/configfile.h> -#endif +#include <xine/configfile.h> typedef struct { int x, y; @@ -187,7 +183,7 @@ void _x_vo_scale_translate_gui2video(vo_scale_t *self, * Returns description of a given ratio code */ -char *_x_vo_scale_aspect_ratio_name(int a) XINE_PROTECTED; +extern const char _x_vo_scale_aspect_ratio_name_table[][8] XINE_PROTECTED; /* * initialize rescaling struct |