[MPlayer-cvslog] r37524 - in branches/1.2: . libmpcodecs/vf_screenshot.c

[rtogni]

Author: rtogni
Date: Sat Sep 12 17:27:47 2015
New Revision: 37524

Log:
Merge screenshot fix from r37523

Modified:
   branches/1.2/   (props changed)
   branches/1.2/libmpcodecs/vf_screenshot.c

Modified: branches/1.2/libmpcodecs/vf_screenshot.c
==============================================================================
--- branches/1.2/libmpcodecs/vf_screenshot.c	Sat Sep 12 17:18:48 2015	(r37523)
+++ branches/1.2/libmpcodecs/vf_screenshot.c	Sat Sep 12 17:27:47 2015	(r37524)
@@ -110,6 +110,9 @@ static void write_png(struct vf_priv_s *
     av_init_packet(&pkt);
     pkt.data = priv->outbuffer;
     pkt.size = priv->outbuffer_size;
+    priv->pic->width = priv->avctx->width;
+    priv->pic->height = priv->avctx->height;
+    priv->pic->format = priv->avctx->pix_fmt;
     res = avcodec_encode_video2(priv->avctx, &pkt, priv->pic, &got_pkt);
     if (res < 0 || !got_pkt || pkt.size <= 0) {
         mp_msg(MSGT_VFILTER,MSGL_ERR,"\nFailed to encode screenshot %s!\n", fname);