diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 12:37:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 12:38:20 +0100 |
| commit | 22af79a9c88f8bfaa8c4130c8f58c5bff20e1a1f (patch) | |
| tree | 1a56136338c010c748cb9a084e82f987b3badd3b /libavformat/aviobuf.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/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 537c11f6b4..7de59f10f3 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -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); |