diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 22:20:44 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 22:20:44 +0100 |
| commit | 42d23a86ff422f650b16ec786f5e96b126ec680a (patch) | |
| tree | 991158f109e0ac97adbe7510529e535fc06234f4 /src/xine-engine/xine_internal.h | |
| parent | 44234828cf17a0a302975dc3f5f8b671f86a8ac2 (diff) | |
| parent | fc2fa145300536b0a19f878212912e9b2d5b57a1 (diff) | |
| download | xine-lib-last-internal-ffmpeg.tar.gz xine-lib-last-internal-ffmpeg.tar.bz2 | |
Merge changes from 1.2 main.last-internal-ffmpeg
Diffstat (limited to 'src/xine-engine/xine_internal.h')
| -rw-r--r-- | src/xine-engine/xine_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 7e57640c0..13b003992 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -445,7 +445,7 @@ void _x_demux_control_start (xine_stream_t *stream) XINE_PROTECTED; void _x_demux_control_end (xine_stream_t *stream, uint32_t flags) XINE_PROTECTED; int _x_demux_start_thread (xine_stream_t *stream) XINE_PROTECTED; int _x_demux_stop_thread (xine_stream_t *stream) XINE_PROTECTED; -int _x_demux_read_header (input_plugin_t *input, unsigned char *buffer, off_t size) XINE_PROTECTED; +int _x_demux_read_header (input_plugin_t *input, void *buffer, off_t size) XINE_PROTECTED; int _x_demux_check_extension (const char *mrl, const char *extensions); off_t _x_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo) XINE_PROTECTED; |