diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /libmpcodecs/vf_screenshot.c | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'libmpcodecs/vf_screenshot.c')
| -rw-r--r-- | libmpcodecs/vf_screenshot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 6bfd84d740..693d871e5f 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" -#include "vf_scale.h" +#include "libmpcodecs/sws_utils.h" #include "fmt-conversion.h" #include "libvo/fastmemcpy.h" @@ -141,6 +141,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) image = *vf->priv->image; image.w = vf->priv->image->w; image.h = vf->priv->image->h; + vf_clone_mpi_attributes(&image, mpi); vf->priv->image_callback(vf->priv->image_callback_ctx, &image); vf->priv->store_slices = 0; } |