Browse Source

lavf: Explicitly convert types at function pointer assignment

This fixes a number of "assignment from incompatible pointer type" warnings.
tags/n2.7
Diego Biurrun 10 years ago
parent
commit
b97f427fb5
3 changed files with 8 additions and 3 deletions
  1. +3
    -1
      libavformat/avio.c
  2. +3
    -1
      libavformat/aviobuf.c
  3. +2
    -1
      libavformat/swfenc.c

+ 3
- 1
libavformat/avio.c View File

@@ -281,7 +281,9 @@ 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,
(int (*)(struct URLContext *, uint8_t *, int))
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)


+ 3
- 1
libavformat/aviobuf.c View File

@@ -692,7 +692,9 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);


*s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h, *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h,
ffurl_read, ffurl_write, ffurl_seek);
(int (*)(void *, uint8_t *, int)) ffurl_read,
(int (*)(void *, uint8_t *, int)) ffurl_write,
(int64_t (*)(void *, int64_t, int)) ffurl_seek);
if (!*s) { if (!*s) {
av_free(buffer); av_free(buffer);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);


+ 2
- 1
libavformat/swfenc.c View File

@@ -427,7 +427,8 @@ 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 (*)(void *, void *, int)) &avio_write);
put_swf_end_tag(s); put_swf_end_tag(s);


/* update FIFO */ /* update FIFO */


Loading…
Cancel
Save