summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-07 19:11:25 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-07 19:11:25 +0000
commit34af64d86b5870d54563e5ea3671046b555ba13d (patch)
tree3e34912100437544ba316855547cc7bf5282b50e /libmpcodecs
parent252f69abf7e53c549ab79f373bc5496221f87c92 (diff)
downloadmpv-34af64d86b5870d54563e5ea3671046b555ba13d.tar.bz2
mpv-34af64d86b5870d54563e5ea3671046b555ba13d.tar.xz
RGB8/BGR8 IMGFMTs are paletted in case of swscale input.
Actually they are also for output, but swscale does not support PIX_FMT_PAL8 output. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_scale.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 9750918c4e..20131ffb3a 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -124,6 +124,7 @@ static int config(struct vf_instance_s* vf,
return 0;
}
sfmt = imgfmt2pixfmt(outfmt);
+ if (outfmt == IMGFMT_RGB8 || outfmt == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8;
dfmt = imgfmt2pixfmt(best);
vo_flags=vf->next->query_format(vf->next,best);
@@ -605,6 +606,7 @@ struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat,
dfmt = imgfmt2pixfmt(dstFormat);
sfmt = imgfmt2pixfmt(srcFormat);
+ if (outfmt == IMGFMT_RGB8 || outfmt == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8;
sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags | get_sws_cpuflags(), srcFilterParam, dstFilterParam, NULL);