summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_asf.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 22:20:44 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-13 22:20:44 +0100
commit42d23a86ff422f650b16ec786f5e96b126ec680a (patch)
tree991158f109e0ac97adbe7510529e535fc06234f4 /src/demuxers/demux_asf.c
parent44234828cf17a0a302975dc3f5f8b671f86a8ac2 (diff)
parentfc2fa145300536b0a19f878212912e9b2d5b57a1 (diff)
downloadxine-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/demuxers/demux_asf.c')
-rw-r--r--src/demuxers/demux_asf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index b9d38ebb3..889299beb 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -376,7 +376,7 @@ static void asf_send_video_header (demux_asf_t *this, int stream) {
static int asf_read_header (demux_asf_t *this) {
int i;
uint64_t asf_header_len;
- char *asf_header_buffer = NULL;
+ uint8_t *asf_header_buffer = NULL;
asf_header_len = get_le64(this);
asf_header_buffer = alloca(asf_header_len);
@@ -1662,7 +1662,7 @@ static int demux_asf_send_chunk (demux_plugin_t *this_gen) {
default:
{
- int header_size = 0;
+ uint32_t header_size = 0;
if (asf_parse_packet_align(this)) {
xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: asf_parse_packet_align failed\n");
@@ -1848,7 +1848,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
start_pos -= (start_pos - this->first_packet_pos) % this->packet_size;
while ((start_pos >= this->first_packet_pos) && (state != 5)) {
- int header_size;
+ uint32_t header_size;
/* seek to the beginning of the previous packet */
lprintf ("demux_asf_seek: seek back\n");