summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-21 21:46:18 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-22 03:41:55 +0100
commit3f72dbe4620716113754d06b7ffd558e56d1585f (patch)
tree8b7f5bed85d5bdcb1aa228eb9ed634c2e1cf4ccf
parent5ffb5e7a2d69f5e4bece9829ede0432b4cbc0fe8 (diff)
downloadffmpeg-streaming-3f72dbe4620716113754d06b7ffd558e56d1585f.zip
ffmpeg-streaming-3f72dbe4620716113754d06b7ffd558e56d1585f.tar.gz
ffplay: fix another use of context instead of frame parameters
Fixes Ticket2050 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffplay.c6
1 files 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;
OpenPOWER on IntegriCloud