X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/478203de36f03a4889699e193bd81d7fb4afbcd7..c29b6eadb255f5f5f732d0391812d97fe015395f:/examples/am7xxx-play.c diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c index 5b2887d..dedf0de 100644 --- a/examples/am7xxx-play.c +++ b/examples/am7xxx-play.c @@ -216,7 +216,7 @@ static int video_output_init(struct video_output_ctx *output_ctx, */ if (image_format == AM7XXX_IMAGE_FORMAT_NV12) { fprintf(stdout, "using raw output format\n"); - output_codec_ctx->pix_fmt = PIX_FMT_NV12; + output_codec_ctx->pix_fmt = AV_PIX_FMT_NV12; output_ctx->codec_ctx = output_codec_ctx; output_ctx->raw_output = 1; ret = 0; @@ -320,6 +320,9 @@ static int am7xxx_play(const char *input_format_string, ret = -ENOMEM; goto cleanup_picture_raw; } + picture_scaled->format = (output_ctx.codec_ctx)->pix_fmt; + picture_scaled->width = (output_ctx.codec_ctx)->width; + picture_scaled->height = (output_ctx.codec_ctx)->height; /* calculate the bytes needed for the output image and create buffer for the output image */ out_buf_size = avpicture_get_size((output_ctx.codec_ctx)->pix_fmt, @@ -382,11 +385,11 @@ static int am7xxx_play(const char *input_format_string, goto end_while; } - /* if we get the complete frame */ + /* if we got the complete frame */ if (got_picture) { /* convert it to YUV */ sws_scale(sw_scale_ctx, - (const uint8_t * const*)picture_raw->data, + (const uint8_t * const *)picture_raw->data, picture_raw->linesize, 0, (input_ctx.codec_ctx)->height, @@ -435,7 +438,7 @@ static int am7xxx_play(const char *input_format_string, out_picture, out_picture_size); if (ret < 0) { - perror("am7xxx_send_image"); + perror("am7xxx_send_image_async"); run = 0; goto end_while; }