Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

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

Conflicts:
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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  =