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

Michael Niedermayer michaelni at gmx.at
Sat Dec 22 03:13:07 CET 2012


On Sat, Dec 22, 2012 at 03:04:21AM +0100, Marton Balint wrote:
> 
> 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.

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121222/a0a38023/attachment.asc>


More information about the ffmpeg-devel mailing list