diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-05 20:52:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-05 20:52:19 +0400 |
| commit | c12068920391c006cf5e72c1fafb4ebf8f807a55 (patch) | |
| tree | b124e5ffd33d01752fc570608e8e004121517e90 /source/blender | |
| parent | df462b89750bfe19ea0d333fcf8184dba94c4a5e (diff) | |
revert changes in own commit to fix warnings, was giving warnings with a newer swscale
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/anim.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index a67bad44fdb..8ebf98ef930 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -362,7 +362,7 @@ static AVFrame* generate_video_frame(uint8_t* pixels, ReportList *reports) } if (c->pix_fmt != PIX_FMT_BGR32) { - sws_scale(img_convert_ctx, (uint8_t **) rgb_frame->data, + sws_scale(img_convert_ctx, (const uint8_t * const*) rgb_frame->data, rgb_frame->linesize, 0, c->height, current_frame->data, current_frame->linesize); delete_picture(rgb_frame); diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c index 67c443d051e..2cb63b7274c 100644 --- a/source/blender/imbuf/intern/anim.c +++ b/source/blender/imbuf/intern/anim.c @@ -816,7 +816,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) { unsigned char* top; sws_scale(anim->img_convert_ctx, - (uint8_t **)input->data, + (const uint8_t * const *)input->data, input->linesize, 0, anim->pCodecCtx->height, @@ -875,7 +875,7 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) { unsigned char* r; sws_scale(anim->img_convert_ctx, - (uint8_t **)input->data, + (const uint8_t * const *)input->data, input->linesize, 0, anim->pCodecCtx->height, |