[FFmpeg-devel] [PATCH 01/15] mpegvideo: Fix several warnings about incompatible pointer type
jamal
jamrial at gmail.com
Fri Jul 27 10:23:12 CEST 2012
---
libavcodec/mpegvideo.h | 2 +-
libavcodec/mpegvideo_enc.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 89160d2..4445a29 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -757,7 +757,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,
- AVFrame *frame, int *got_packet);
+ const 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 f3f7162..3e9204d 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1445,7 +1445,7 @@ no_output_pic:
}
int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
- AVFrame *pic_arg, int *got_packet)
+ const AVFrame *pic_arg, int *got_packet)
{
MpegEncContext *s = avctx->priv_data;
int i, stuffing_count, ret;
@@ -1453,7 +1453,7 @@ int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
s->picture_in_gop_number++;
- if (load_input_picture(s, pic_arg) < 0)
+ if (load_input_picture(s, (AVFrame *)pic_arg) < 0)
return -1;
if (select_input_picture(s) < 0) {
--
1.7.8.6
More information about the ffmpeg-devel
mailing list