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/demux.c | |
parent | 44234828cf17a0a302975dc3f5f8b671f86a8ac2 (diff) | |
parent | fc2fa145300536b0a19f878212912e9b2d5b57a1 (diff) | |
download | xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.gz xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.bz2 |
Merge changes from 1.2 main.last-internal-ffmpeg
Diffstat (limited to 'src/xine-engine/demux.c')
-rw-r--r-- | src/xine-engine/demux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 187c27873..6f9f6381d 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -423,7 +423,7 @@ int _x_demux_stop_thread (xine_stream_t *stream) { return 0; } -int _x_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t size){ +int _x_demux_read_header( input_plugin_t *input, void *buffer, off_t size){ int read_size; unsigned char *buf; |