mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ecc5c4db2dd3a0f328d95df89daa59f78b4b2810'
* commit 'ecc5c4db2dd3a0f328d95df89daa59f78b4b2810': doc/examples/output: Cast pointer to the right (const) type Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
91b4d10917
|
@ -488,9 +488,9 @@ static AVFrame *get_video_frame(OutputStream *ost)
|
|||
}
|
||||
}
|
||||
fill_yuv_image(ost->tmp_frame, ost->next_pts, c->width, c->height);
|
||||
sws_scale(ost->sws_ctx,
|
||||
(const uint8_t * const *)ost->tmp_frame->data, ost->tmp_frame->linesize,
|
||||
0, c->height, ost->frame->data, ost->frame->linesize);
|
||||
sws_scale(ost->sws_ctx, (const uint8_t * const *) ost->tmp_frame->data,
|
||||
ost->tmp_frame->linesize, 0, c->height, ost->frame->data,
|
||||
ost->frame->linesize);
|
||||
} else {
|
||||
fill_yuv_image(ost->frame, ost->next_pts, c->width, c->height);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue