summaryrefslogtreecommitdiffstats
path: root/mpvcore
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-24 16:33:13 +0200
committerwm4 <wm4@nowhere>2013-08-24 17:03:06 +0200
commitc3a0721d095969de1b86e7be8bce21854145e718 (patch)
tree7de912f39cdc3d40d83b86fa8d197addeb3f760d /mpvcore
parent086b37a830261adb4ecf816413f1fec1dda9bbd4 (diff)
downloadmpv-c3a0721d095969de1b86e7be8bce21854145e718.tar.bz2
mpv-c3a0721d095969de1b86e7be8bce21854145e718.tar.xz
video/out: don't require VOs to handle screenshot aspect specially
This affects VOs which just reuse the mp_image from draw_image() to return screenshots. The aspect of these images is never different from the aspect the screenshots should be, so there's no reason to adjust the aspect in these cases. Other VOs still need it in order to restore the original image attributes. This requires some changes to the video filter code to make sure that the aspect in the passed mp_images is consistent. The changes in mplayer.c and vd_lavc.c are (probably) not strictly needed for this commit, but contribute to consistency.
Diffstat (limited to 'mpvcore')
-rw-r--r--mpvcore/mplayer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index 0a25680364..ed7fbec15e 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -2509,6 +2509,7 @@ static void filter_video(struct MPContext *mpctx, struct mp_image *frame)
struct sh_video *sh_video = mpctx->sh_video;
frame->pts = sh_video->pts;
+ mp_image_set_params(frame, sh_video->vf_input);
vf_filter_frame(sh_video->vfilter, frame);
filter_output_queued_frame(mpctx);
}