[FFmpeg-devel] [PATCH] ffplay: fix another use of context instead of frame parameters

Marton Balint cus at passwd.hu
Sat Dec 22 03:04:21 CET 2012


On Fri, 21 Dec 2012, Michael Niedermayer wrote:

> Fixes Ticket2050
>
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
> ffplay.c |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/ffplay.c b/ffplay.c
> index 83f46f5..b69b503 100644
> --- a/ffplay.c
> +++ b/ffplay.c
> @@ -1719,7 +1719,7 @@ fail:
>     return ret;
> }
>
> -static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters)
> +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters, AVFrame *frame)
> {
>     static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE };
>     char sws_flags_str[128];
> @@ -1737,7 +1737,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
>
>     snprintf(buffersrc_args, sizeof(buffersrc_args),
>              "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
> -             codec->width, codec->height, codec->pix_fmt,
> +             frame->width, frame->height, frame->format,
>              is->video_st->time_base.num, is->video_st->time_base.den,
>              codec->sample_aspect_ratio.num, FFMAX(codec->sample_aspect_ratio.den, 1));
>
> @@ -1828,7 +1828,7 @@ static int video_thread(void *arg)
>                    last_w, last_h, frame->width, frame->height);
>             avfilter_graph_free(&graph);
>             graph = avfilter_graph_alloc();
> -            if ((ret = configure_video_filters(graph, is, vfilters)) < 0) {
> +            if ((ret = configure_video_filters(graph, is, vfilters, frame)) < 0) {
>                 SDL_Event event;
>                 event.type = FF_QUIT_EVENT;
>                 event.user.data1 = is;
> --

LGTM, thanks.

Marton


More information about the ffmpeg-devel mailing list