summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-15 16:02:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-20 16:29:08 +0200
commit4b5ff9b63ef36ef2008cf18ee352eabe34501d8e (patch)
treebf367412e366714154d257c7d07799271446dda3 /ffplay.c
parent4d18f4c15be1b338d30c236d8065d4cac75ceed1 (diff)
ffplay: Use input picture parameters in input_request_frame().
Fixes Ticket122 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index 04386e1f44..337a39066e 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1672,10 +1672,10 @@ static int input_request_frame(AVFilterLink *link)
if (priv->use_dr1 && priv->frame->opaque) {
picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
} else {
- picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
+ picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, priv->frame->width, priv->frame->height);
av_image_copy(picref->data, picref->linesize,
(const uint8_t **)(void **)priv->frame->data, priv->frame->linesize,
- picref->format, link->w, link->h);
+ picref->format, priv->frame->width, priv->frame->height);
}
av_free_packet(&pkt);
@@ -1684,7 +1684,7 @@ static int input_request_frame(AVFilterLink *link)
picref->pts = pts;
avfilter_start_frame(link, picref);
- avfilter_draw_slice(link, 0, link->h, 1);
+ avfilter_draw_slice(link, 0, picref->video->h, 1);
avfilter_end_frame(link);
return 0;