Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From: Alexander Prikhodko <[email protected]>
- Date: Sat, 24 Apr 2010 18:41:25 +0300
- Subject: [PATCH] Fix GCC warning about sws_scale type cast
- input/ffms.c | 2 +-
- input/lavf.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
- Index: input/ffms.c
- ===================================================================
- --- input/ffms_orig.c
- +++ input/ffms.c
- @@ -207,7 +207,7 @@ static int read_frame( x264_picture_t *p_pic, hnd_t handle, int i_frame )
- * With threaded input, copying the pointers would result in the data changing during encoding.
- * FIXME: don't do redundant sws_scales for singlethreaded input, or fix FFMS to allow
- * multiple FFMS_Frame buffers. */
- - sws_scale( h->scaler, (uint8_t**)frame->Data, (int*)frame->Linesize, 0,
- + sws_scale( h->scaler, (const uint8_t * const *)frame->Data, (int*)frame->Linesize, 0,
- frame->EncodedHeight, p_pic->img.plane, p_pic->img.i_stride );
- const FFMS_FrameInfo *info = FFMS_GetFrameInfo( h->track, i_frame );
- Index: input/lavf.c
- ===================================================================
- --- input/lavf_orig.c
- +++ input/lavf.c
- @@ -121,7 +121,7 @@ static int read_frame_internal( x264_picture_t *p_pic, lavf_hnd_t *h, int i_fram
- if( check_swscale( h, c, i_frame ) )
- return -1;
- /* FIXME: avoid sws_scale where possible (no colorspace conversion). */
- - sws_scale( h->scaler, frame->data, frame->linesize, 0, c->height, p_pic->img.plane, p_pic->img.i_stride );
- + sws_scale( h->scaler, (const uint8_t * const *)frame->data, frame->linesize, 0, c->height, p_pic->img.plane, p_pic->img.i_stride );
- if( info )
- {
Advertisement
Add Comment
Please, Sign In to add comment