diff options
| author | jstebbins <[email protected]> | 2011-04-08 18:10:43 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-04-08 18:10:43 +0000 |
| commit | 122c93f2b05790907e79c9a292342b3763399948 (patch) | |
| tree | d4a893193f07f11336626e86e909b2c8879ab59e /libhb | |
| parent | db4b25fc4de5db124cb2d771ca3369d9d9b36d61 (diff) | |
Eliminate incompatible pointer type warnings for sws_scale
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3910 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/decavcodec.c | 2 | ||||
| -rw-r--r-- | libhb/decmpeg2.c | 2 | ||||
| -rw-r--r-- | libhb/hb.c | 4 | ||||
| -rw-r--r-- | libhb/render.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index b35d57119..53e47c7b5 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -639,7 +639,7 @@ static hb_buffer_t *copy_frame( hb_work_private_t *pv, AVFrame *frame ) w, h, PIX_FMT_YUV420P, SWS_LANCZOS|SWS_ACCURATE_RND); } - sws_scale( pv->sws_context, frame->data, frame->linesize, 0, h, + sws_scale( pv->sws_context, (const uint8_t* const *)frame->data, frame->linesize, 0, h, dstpic.data, dstpic.linesize ); } else diff --git a/libhb/decmpeg2.c b/libhb/decmpeg2.c index 19d1d4213..2d2f41d41 100644 --- a/libhb/decmpeg2.c +++ b/libhb/decmpeg2.c @@ -296,7 +296,7 @@ static hb_buffer_t *hb_copy_frame( hb_job_t *job, int width, int height, struct SwsContext *context = hb_sws_get_context( src_w, src_h, pixfmt, dst_w, dst_h, PIX_FMT_YUV420P, SWS_LANCZOS|SWS_ACCURATE_RND); - sws_scale( context, pic_crop.data, pic_crop.linesize, 0, src_h, out.data, out.linesize ); + sws_scale( context, (const uint8_t* const *)pic_crop.data, pic_crop.linesize, 0, src_h, out.data, out.linesize ); sws_freeContext( context ); return buf; diff --git a/libhb/hb.c b/libhb/hb.c index 4c16156c5..55d5f6886 100644 --- a/libhb/hb.c +++ b/libhb/hb.c @@ -724,7 +724,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, // Scale sws_scale(context, - pic_crop.data, pic_crop.linesize, + (const uint8_t* const *)pic_crop.data, pic_crop.linesize, 0, title->height - (job->crop[0] + job->crop[1]), pic_scale.data, pic_scale.linesize); @@ -738,7 +738,7 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture, // Create preview sws_scale(context, - pic_scale.data, pic_scale.linesize, + (const uint8_t* const *)pic_scale.data, pic_scale.linesize, 0, job->height, pic_preview.data, pic_preview.linesize); diff --git a/libhb/render.c b/libhb/render.c index f8fff9d09..20736c29f 100644 --- a/libhb/render.c +++ b/libhb/render.c @@ -547,7 +547,8 @@ int renderWork( hb_work_object_t * w, hb_buffer_t ** buf_in, // Scale pic_crop into pic_render according to the context set up in renderInit sws_scale(pv->context, - pv->pic_tmp_crop.data, pv->pic_tmp_crop.linesize, + (const uint8_t* const *)pv->pic_tmp_crop.data, + pv->pic_tmp_crop.linesize, 0, title->height - (job->crop[0] + job->crop[1]), pv->pic_tmp_out.data, pv->pic_tmp_out.linesize); |