Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n0.8
@@ -307,7 +307,7 @@ int ffurl_write(URLContext *h, const unsigned char *buf, int size) | |||||
if (h->max_packet_size && size > h->max_packet_size) | if (h->max_packet_size && size > h->max_packet_size) | ||||
return AVERROR(EIO); | return AVERROR(EIO); | ||||
return retry_transfer_wrapper(h, buf, size, size, h->prot->url_write); | |||||
return retry_transfer_wrapper(h, buf, size, size, (void*)h->prot->url_write); | |||||
} | } | ||||
int64_t ffurl_seek(URLContext *h, int64_t pos, int whence) | int64_t ffurl_seek(URLContext *h, int64_t pos, int whence) | ||||
@@ -853,7 +853,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) | |||||
if (ffio_init_context(*s, buffer, buffer_size, | if (ffio_init_context(*s, buffer, buffer_size, | ||||
h->flags & AVIO_FLAG_WRITE, h, | h->flags & AVIO_FLAG_WRITE, h, | ||||
ffurl_read, ffurl_write, ffurl_seek) < 0) { | |||||
(void*)ffurl_read, (void*)ffurl_write, (void*)ffurl_seek) < 0) { | |||||
av_free(buffer); | av_free(buffer); | ||||
av_freep(s); | av_freep(s); | ||||
return AVERROR(EIO); | return AVERROR(EIO); | ||||
@@ -923,7 +923,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index, | |||||
/* output data */ | /* output data */ | ||||
assert(payload_size - stuffing_size <= av_fifo_size(stream->fifo)); | assert(payload_size - stuffing_size <= av_fifo_size(stream->fifo)); | ||||
av_fifo_generic_read(stream->fifo, ctx->pb, payload_size - stuffing_size, &avio_write); | |||||
av_fifo_generic_read(stream->fifo, ctx->pb, payload_size - stuffing_size, (void*)avio_write); | |||||
stream->bytes_to_iframe -= payload_size - stuffing_size; | stream->bytes_to_iframe -= payload_size - stuffing_size; | ||||
}else{ | }else{ | ||||
payload_size= | payload_size= | ||||
@@ -421,7 +421,7 @@ static int swf_write_video(AVFormatContext *s, | |||||
put_swf_tag(s, TAG_STREAMBLOCK | TAG_LONG); | put_swf_tag(s, TAG_STREAMBLOCK | TAG_LONG); | ||||
avio_wl16(pb, swf->sound_samples); | avio_wl16(pb, swf->sound_samples); | ||||
avio_wl16(pb, 0); // seek samples | avio_wl16(pb, 0); // seek samples | ||||
av_fifo_generic_read(swf->audio_fifo, pb, frame_size, &avio_write); | |||||
av_fifo_generic_read(swf->audio_fifo, pb, frame_size, (void*)avio_write); | |||||
put_swf_end_tag(s); | put_swf_end_tag(s); | ||||
/* update FIFO */ | /* update FIFO */ | ||||