diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/flac_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/libopenh264enc.c | 4 | ||||
| -rw-r--r-- | libavcodec/libschroedinger.c | 2 | ||||
| -rw-r--r-- | libavcodec/vdpau.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 70b9a651e9..cb394f2bdb 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -588,7 +588,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx, read_end - read_start, NULL); } else { int8_t pad[MAX_FRAME_HEADER_SIZE] = { 0 }; - av_fifo_generic_write(fpc->fifo_buf, (void*) pad, sizeof(pad), NULL); + av_fifo_generic_write(fpc->fifo_buf, pad, sizeof(pad), NULL); } /* Tag headers and update sequences. */ diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index a09b7cf618..b7c011893e 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -112,10 +112,10 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) // Set the logging callback function to one that uses av_log() (see implementation above). callback_function = (WelsTraceCallback) ff_libopenh264_trace_callback; - (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK, (void *)&callback_function); + (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK, &callback_function); // Set the AVCodecContext as the libopenh264 callback context so that it can be passed to av_log(). - (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, (void *)&avctx); + (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, &avctx); (*s->encoder)->GetDefaultParams(s->encoder, ¶m); diff --git a/libavcodec/libschroedinger.c b/libavcodec/libschroedinger.c index 16e0fe89b9..af3000f371 100644 --- a/libavcodec/libschroedinger.c +++ b/libavcodec/libschroedinger.c @@ -200,7 +200,7 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avctx, p_frame->format = schro_frame_fmt; p_frame->width = y_width; p_frame->height = y_height; - schro_frame_set_free_callback(p_frame, free_schro_frame, (void *)p_pic); + schro_frame_set_free_callback(p_frame, free_schro_frame, p_pic); for (i = 0; i < 3; ++i) { p_frame->components[i].width = i ? uv_width : y_width; diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index f638d20115..d3cb188d74 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -267,7 +267,7 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame, if (val < 0) return val; - status = vdctx->render(vdctx->decoder, surf, (void *)&pic_ctx->info, + status = vdctx->render(vdctx->decoder, surf, &pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); |