aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-15 22:04:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-15 22:05:30 +0100
commitbf3a40457264556ec1a39aa0659af921a5dd5df9 (patch)
tree92592f8dc13140f4786a23203a5eef694cec6bba
parentadd40b7b6afc18eb1cf410bc814db3a3ec5858cf (diff)
downloadffmpeg-bf3a40457264556ec1a39aa0659af921a5dd5df9.tar.gz
mpegvideo: fix constness error in ff_MPV_encode_picture()
The struct has some of its fields changed, thus is not strictly const. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpegvideo.h2
-rw-r--r--libavcodec/mpegvideo_enc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 8cda2e9e2a..102c73b311 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -750,7 +750,7 @@ void ff_MPV_frame_end(MpegEncContext *s);
int ff_MPV_encode_init(AVCodecContext *avctx);
int ff_MPV_encode_end(AVCodecContext *avctx);
int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
- const AVFrame *frame, int *got_packet);
+ AVFrame *frame, int *got_packet);
void ff_MPV_common_init_mmx(MpegEncContext *s);
void ff_MPV_common_init_axp(MpegEncContext *s);
void ff_MPV_common_init_mmi(MpegEncContext *s);
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 9c7b889b97..4a79dff374 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1418,7 +1418,7 @@ no_output_pic:
}
int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
- const AVFrame *pic_arg, int *got_packet)
+ AVFrame *pic_arg, int *got_packet)
{
MpegEncContext *s = avctx->priv_data;
int i, stuffing_count, ret;