diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:20:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:20:54 +0200 |
| commit | e18d9d90f1d30feed02a0d973ee1c0e46f6abfd7 (patch) | |
| tree | 3b00c61d68c0c45d1bdf044a05947f2f7a2d69a7 /libavformat | |
| parent | a71fcfad892c4c59a011556f70b998aca1139b37 (diff) | |
| parent | 8c6f430291374cf6d2cfb85cdbb809803b5a7d83 (diff) | |
| download | ffmpeg-e18d9d90f1d30feed02a0d973ee1c0e46f6abfd7.tar.gz | |
Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'
* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
mpeg: Suppress a compiler warning on callback type
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 4069e425be..e4c9995d79 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -871,7 +871,8 @@ static int flush_packet(AVFormatContext *ctx, int stream_index, /* output data */ assert(payload_size - stuffing_size <= av_fifo_size(stream->fifo)); av_fifo_generic_read(stream->fifo, ctx->pb, - payload_size - stuffing_size, (void*)avio_write); + payload_size - stuffing_size, + (void (*)(void*, void*, int))avio_write); stream->bytes_to_iframe -= payload_size - stuffing_size; } else { payload_size = |