RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2012-12-21 21:46:18 +01:00
parent 5ffb5e7a2d
commit 3f72dbe462
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplay.c
View File

@ -1719,7 +1719,7 @@ fail:
return ret; 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 }; static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE };
char sws_flags_str[128]; 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), snprintf(buffersrc_args, sizeof(buffersrc_args),
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d", "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, is->video_st->time_base.num, is->video_st->time_base.den,
codec->sample_aspect_ratio.num, FFMAX(codec->sample_aspect_ratio.den, 1)); 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); last_w, last_h, frame->width, frame->height);
avfilter_graph_free(&graph); avfilter_graph_free(&graph);
graph = avfilter_graph_alloc(); 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; SDL_Event event;
event.type = FF_QUIT_EVENT; event.type = FF_QUIT_EVENT;
event.user.data1 = is; event.user.data1 = is;