From c3a0721d095969de1b86e7be8bce21854145e718 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 24 Aug 2013 16:33:13 +0200 Subject: 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. --- video/decode/vd_lavc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'video/decode/vd_lavc.c') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 5303d1f748..838a3deab2 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -748,9 +748,7 @@ static int decode(struct sh_video *sh, struct demux_packet *packet, if (ctx->hwdec && ctx->hwdec->process_image) mpi = ctx->hwdec->process_image(ctx, mpi); - mpi->colorspace = ctx->image_params.colorspace; - mpi->levels = ctx->image_params.colorlevels; - mpi->chroma_location = ctx->image_params.chroma_location; + mp_image_set_params(mpi, &ctx->image_params); *out_image = mpi; return 1; -- cgit v1.2.3