diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-14 16:25:38 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-14 16:25:38 +0200 |
| commit | 97049a8985f7f9cadff0d61d65961c5cfd490829 (patch) | |
| tree | 32db874d5040bc0a42f20b5a9f5adc1712471373 /src/xine-engine | |
| parent | 7ae03d031828b8595ef6a441717b3b5402f6ce0d (diff) | |
| parent | 9f35b93d3ee2a40444c538247cfc5b05b4b0bf89 (diff) | |
| download | xine-lib-97049a8985f7f9cadff0d61d65961c5cfd490829.tar.gz xine-lib-97049a8985f7f9cadff0d61d65961c5cfd490829.tar.bz2 | |
Merge from 1.1 branch.
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/osd.c | 2 | ||||
| -rw-r--r-- | src/xine-engine/xine_interface.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index b8c3a1fd2..ab34a11e9 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -1045,7 +1045,7 @@ static int osd_search(osd_fontchar_t *array, size_t n, uint16_t code) { * get next unicode value */ static uint16_t osd_iconv_getunicode(xine_t *xine, - iconv_t *cd, const char *encoding, ICONV_CONST char **inbuf, + iconv_t cd, const char *encoding, ICONV_CONST char **inbuf, size_t *inbytesleft) { uint16_t unicode; char *outbuf = (char*)&unicode; diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 166d7a3ef..a4a7ecbf9 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -947,7 +947,7 @@ xine_post_out_t * xine_get_audio_source(xine_stream_t *stream) { int _x_message(xine_stream_t *stream, int type, ...) { xine_ui_message_data_t *data; xine_event_t event; - char *explanation; + const char *explanation; int size; int n; va_list ap; |