Commit 1d0048cf authored by Stefano Sabatini's avatar Stefano Sabatini

examples/muxing: rename img_convert_ctx to sws_ctx

The new name is more consistent with the codebase, and more
self-consistent with the libswscale API.
parent 976bb42a
...@@ -313,7 +313,7 @@ static void fill_yuv_image(AVPicture *pict, int frame_index, ...@@ -313,7 +313,7 @@ static void fill_yuv_image(AVPicture *pict, int frame_index,
static void write_video_frame(AVFormatContext *oc, AVStream *st) static void write_video_frame(AVFormatContext *oc, AVStream *st)
{ {
int ret; int ret;
static struct SwsContext *img_convert_ctx; static struct SwsContext *sws_ctx;
AVCodecContext *c = st->codec; AVCodecContext *c = st->codec;
if (frame_count >= STREAM_NB_FRAMES) { if (frame_count >= STREAM_NB_FRAMES) {
...@@ -324,20 +324,18 @@ static void write_video_frame(AVFormatContext *oc, AVStream *st) ...@@ -324,20 +324,18 @@ static void write_video_frame(AVFormatContext *oc, AVStream *st)
if (c->pix_fmt != PIX_FMT_YUV420P) { if (c->pix_fmt != PIX_FMT_YUV420P) {
/* as we only generate a YUV420P picture, we must convert it /* as we only generate a YUV420P picture, we must convert it
* to the codec pixel format if needed */ * to the codec pixel format if needed */
if (img_convert_ctx == NULL) { if (!sws_ctx) {
img_convert_ctx = sws_getContext(c->width, c->height, sws_ctx = sws_getContext(c->width, c->height, PIX_FMT_YUV420P,
PIX_FMT_YUV420P, c->width, c->height, c->pix_fmt,
c->width, c->height, sws_flags, NULL, NULL, NULL);
c->pix_fmt, if (!sws_ctx) {
sws_flags, NULL, NULL, NULL);
if (img_convert_ctx == NULL) {
fprintf(stderr, fprintf(stderr,
"Cannot initialize the conversion context\n"); "Cannot initialize the conversion context\n");
exit(1); exit(1);
} }
} }
fill_yuv_image(&src_picture, frame_count, c->width, c->height); fill_yuv_image(&src_picture, frame_count, c->width, c->height);
sws_scale(img_convert_ctx, sws_scale(sws_ctx,
(const uint8_t * const *)src_picture.data, src_picture.linesize, (const uint8_t * const *)src_picture.data, src_picture.linesize,
0, c->height, dst_picture.data, dst_picture.linesize); 0, c->height, dst_picture.data, dst_picture.linesize);
} else { } else {
......
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