diff options
| author | Marton Balint <cus@passwd.hu> | 2012-08-26 11:56:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 01:44:57 +0200 |
| commit | a366beaf6a7cbaa43fef09cabc2248225290208f (patch) | |
| tree | b6c7c8807f4614b2342088456f1a760663740db6 /ffplay.c | |
| parent | 95d1af118861e9fc09607de7fe879ee1c41c4328 (diff) | |
| download | ffmpeg-a366beaf6a7cbaa43fef09cabc2248225290208f.tar.gz | |
ffplay: fix odd YUV width by cropping the video
Should fix issue #1322.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1586,7 +1586,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c char buffersrc_args[256]; int ret; AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc(); - AVFilterContext *filt_src = NULL, *filt_out = NULL, *filt_format; + AVFilterContext *filt_src = NULL, *filt_out = NULL, *filt_format, *filt_crop; AVCodecContext *codec = is->video_st->codec; snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); @@ -1612,14 +1612,22 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c if (ret < 0) return ret; + /* SDL YUV code is not handling odd width/height for some driver + * combinations, therefore we crop the picture to an even width/height. */ + if ((ret = avfilter_graph_create_filter(&filt_crop, + avfilter_get_by_name("crop"), + "ffplay_crop", "floor(in_w/2)*2:floor(in_h/2)*2", NULL, graph)) < 0) + return ret; if ((ret = avfilter_graph_create_filter(&filt_format, avfilter_get_by_name("format"), "format", "yuv420p", NULL, graph)) < 0) return ret; + if ((ret = avfilter_link(filt_crop, 0, filt_format, 0)) < 0) + return ret; if ((ret = avfilter_link(filt_format, 0, filt_out, 0)) < 0) return ret; - if ((ret = configure_filtergraph(graph, vfilters, filt_src, filt_format)) < 0) + if ((ret = configure_filtergraph(graph, vfilters, filt_src, filt_crop)) < 0) return ret; is->in_video_filter = filt_src; |