[FFmpeg-cvslog] swscale: don't use planar output functions to write to NV12/21.

Ronald S. Bultje git at videolan.org
Wed Jun 29 05:26:33 CEST 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sun Jun 26 15:52:00 2011 -0700| [0d994b2f45c08794899057ee7ca54f48218c0a53] | committer: Ronald Bultje

swscale: don't use planar output functions to write to NV12/21.

This prevents a crash when converting to NV12/21 without the bitexact
flags enabled.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d994b2f45c08794899057ee7ca54f48218c0a53
---

 libswscale/x86/swscale_template.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c
index 79bf2a4..f6e9708 100644
--- a/libswscale/x86/swscale_template.c
+++ b/libswscale/x86/swscale_template.c
@@ -2202,7 +2202,8 @@ static av_cold void RENAME(sws_init_swScale)(SwsContext *c)
     enum PixelFormat srcFormat = c->srcFormat,
                      dstFormat = c->dstFormat;
 
-    if (!is16BPS(dstFormat) && !is9_OR_10BPS(dstFormat)) {
+    if (!is16BPS(dstFormat) && !is9_OR_10BPS(dstFormat) &&
+        dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21) {
         if (!(c->flags & SWS_BITEXACT)) {
             if (c->flags & SWS_ACCURATE_RND) {
                 c->yuv2yuv1 = RENAME(yuv2yuv1_ar    );



More information about the ffmpeg-cvslog mailing list