[FFmpeg-cvslog] ffplay: Use input picture parameters in input_request_frame().

Michael Niedermayer git at videolan.org
Sun May 20 16:40:05 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 15 16:02:49 2012 +0200| [4b5ff9b63ef36ef2008cf18ee352eabe34501d8e] | committer: Michael Niedermayer

ffplay: Use input picture parameters in input_request_frame().

Fixes Ticket122

Reviewed-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b5ff9b63ef36ef2008cf18ee352eabe34501d8e
---

 ffplay.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 04386e1..337a390 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;



More information about the ffmpeg-cvslog mailing list