[FFmpeg-devel] [PATCH] examples/muxing: rename img_convert_ctx to sws_ctx

[Clément Bœsch]

On Tue, Sep 11, 2012 at 06:24:50PM +0200, Stefano Sabatini wrote:
> The new name is more consistent with the codebase, and more
> self-consistent with the libswscale API.
> ---
>  doc/examples/muxing.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
> index 2ef1d50..3bf21e9 100644
> --- a/doc/examples/muxing.c
> +++ b/doc/examples/muxing.c
> @@ -294,7 +294,7 @@ static void fill_yuv_image(AVPicture *pict, int frame_index,
>  static void write_video_frame(AVFormatContext *oc, AVStream *st)
>  {
>      int ret;
> -    static struct SwsContext *img_convert_ctx;
> +    static struct SwsContext *sws_ctx;
>      AVCodecContext *c = st->codec;
>  
>      if (frame_count >= STREAM_NB_FRAMES) {
> @@ -305,20 +305,20 @@ static void write_video_frame(AVFormatContext *oc, AVStream *st)
>          if (c->pix_fmt != PIX_FMT_YUV420P) {
>              /* as we only generate a YUV420P picture, we must convert it
>               * to the codec pixel format if needed */
> -            if (img_convert_ctx == NULL) {
> -                img_convert_ctx = sws_getContext(c->width, c->height,
> -                                                 PIX_FMT_YUV420P,
> -                                                 c->width, c->height,
> -                                                 c->pix_fmt,
> -                                                 sws_flags, NULL, NULL, NULL);
> -                if (img_convert_ctx == NULL) {
> +            if (!sws_ctx) {
> +                sws_ctx = sws_getContext(c->width, c->height,
> +                                         PIX_FMT_YUV420P,
> +                                         c->width, c->height,
> +                                         c->pix_fmt,
> +                                         sws_flags, NULL, NULL, NULL);
> +                if (!sws_ctx) {
>                      fprintf(stderr,
>                              "Cannot initialize the conversion context\n");
>                      exit(1);
>                  }
>              }
>              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,
>                        0, c->height, dst_picture.data, dst_picture.linesize);
>          } else {

LGTM

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120911/565960d8/attachment.asc>