Browse code

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>

Michael Niedermayer authored on 2012/05/15 23:02:49
Showing 1 changed files
... ...
@@ -1672,10 +1672,10 @@ static int input_request_frame(AVFilterLink *link)
1672 1672
     if (priv->use_dr1 && priv->frame->opaque) {
1673 1673
         picref = avfilter_ref_buffer(priv->frame->opaque, ~0);
1674 1674
     } else {
1675
-        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h);
1675
+        picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, priv->frame->width, priv->frame->height);
1676 1676
         av_image_copy(picref->data, picref->linesize,
1677 1677
                       (const uint8_t **)(void **)priv->frame->data, priv->frame->linesize,
1678
-                      picref->format, link->w, link->h);
1678
+                      picref->format, priv->frame->width, priv->frame->height);
1679 1679
     }
1680 1680
     av_free_packet(&pkt);
1681 1681
 
... ...
@@ -1684,7 +1684,7 @@ static int input_request_frame(AVFilterLink *link)
1684 1684
     picref->pts = pts;
1685 1685
 
1686 1686
     avfilter_start_frame(link, picref);
1687
-    avfilter_draw_slice(link, 0, link->h, 1);
1687
+    avfilter_draw_slice(link, 0, picref->video->h, 1);
1688 1688
     avfilter_end_frame(link);
1689 1689
 
1690 1690
     return 0;