Commit 91b4d109 authored by James Almer's avatar James Almer

Merge commit 'ecc5c4db'

* commit 'ecc5c4db':
  doc/examples/output: Cast pointer to the right (const) type
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 4c410a58 ecc5c4db
...@@ -488,9 +488,9 @@ static AVFrame *get_video_frame(OutputStream *ost) ...@@ -488,9 +488,9 @@ static AVFrame *get_video_frame(OutputStream *ost)
} }
} }
fill_yuv_image(ost->tmp_frame, ost->next_pts, c->width, c->height); fill_yuv_image(ost->tmp_frame, ost->next_pts, c->width, c->height);
sws_scale(ost->sws_ctx, sws_scale(ost->sws_ctx, (const uint8_t * const *) ost->tmp_frame->data,
(const uint8_t * const *)ost->tmp_frame->data, ost->tmp_frame->linesize, ost->tmp_frame->linesize, 0, c->height, ost->frame->data,
0, c->height, ost->frame->data, ost->frame->linesize); ost->frame->linesize);
} else { } else {
fill_yuv_image(ost->frame, ost->next_pts, c->width, c->height); fill_yuv_image(ost->frame, ost->next_pts, c->width, c->height);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment