summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-03-07 20:07:44 +0100
committerNicolas George <nicolas.george@normalesup.org>2012-03-08 17:13:58 +0100
commit15d75dabee81536255f05996abf1f0b8af632d30 (patch)
treed94383339cab6e1245236a27a8f3c8b68f337297 /libavcodec
parentfe9818d0047973898473c5723bcb5e02392f579e (diff)
lavc/utils: fix three const warnings.
No change in assembly code produced on x86_64.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8619285b7c..23ab832022 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -297,7 +297,7 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
}
if ((ret = av_samples_fill_arrays(frame->extended_data, &frame->linesize[0],
- buf, nb_channels, frame->nb_samples,
+ (uint8_t *)(intptr_t)buf, nb_channels, frame->nb_samples,
sample_fmt, align)) < 0) {
if (frame->extended_data != frame->data)
av_freep(&frame->extended_data);
@@ -1127,7 +1127,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
avctx->sample_fmt, 1);
if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
avctx->sample_fmt,
- samples, samples_size, 1)))
+ (const uint8_t *)samples, samples_size, 1)))
return ret;
/* fabricate frame pts from sample count.
@@ -1249,7 +1249,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
return -1;
}
- ret = avctx->codec->encode(avctx, buf, buf_size, sub);
+ ret = avctx->codec->encode(avctx, buf, buf_size, (void *)(intptr_t)sub);
avctx->frame_number++;
return ret;
}