diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 14:37:13 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 14:38:20 +0300 |
commit | 22af79a9c88f8bfaa8c4130c8f58c5bff20e1a1f (patch) | |
tree | 1a56136338c010c748cb9a084e82f987b3badd3b /libavformat/avio.c | |
parent | 7d63f10c37cd9327c39ae4e3e7ec389c08b87390 (diff) | |
parent | b97f427fb56bdbf7de8e2d4b72d01114aa6eceda (diff) |
Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
lavf: Explicitly convert types at function pointer assignment
Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c
See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio.c')
-rw-r--r-- | libavformat/avio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 326bb0aa78..4896782072 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -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) |