videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-04 01:30:05 +02:00
Code Releases Activity

Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

Browse Source 
* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
  mpeg: Suppress a compiler warning on callback type

Conflicts:
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-10 02:20:54 +02:00
commit e18d9d90f1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mpegenc.c
View File

@ -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 =