mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
lavf: Explicitly convert types at function pointer assignment
Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c
See: a76a2ffe9d
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
22af79a9c8
@ -349,7 +349,9 @@ int ffurl_write(URLContext *h, const unsigned char *buf, int size)
|
||||
if (h->max_packet_size && size > h->max_packet_size)
|
||||
return AVERROR(EIO);
|
||||
|
||||
return retry_transfer_wrapper(h, (unsigned char *)buf, size, size, (void*)h->prot->url_write);
|
||||
return retry_transfer_wrapper(h, (unsigned char *)buf, size, size,
|
||||
(int (*)(struct URLContext *, uint8_t *, int))
|
||||
h->prot->url_write);
|
||||
}
|
||||
|
||||
int64_t ffurl_seek(URLContext *h, int64_t pos, int whence)
|
||||
|
@ -778,7 +778,9 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
*s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h,
|
||||
(void*)ffurl_read, (void*)ffurl_write, (void*)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) {
|
||||
av_free(buffer);
|
||||
return AVERROR(ENOMEM);
|
||||
|
Loading…
Reference in New Issue
Block a user