[FFmpeg-cvslog] swscale/utils: Forward luma range to the cascaded context for alphablending

Michael Niedermayer git at videolan.org
Thu Sep 10 17:31:07 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep 10 17:03:11 2015 +0200| [21c7272859134734c6bda17ae0e973b23f20694d] | committer: Michael Niedermayer

swscale/utils: Forward luma range to the cascaded context for alphablending

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libswscale/utils.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 450d0d5..5265157 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1500,11 +1500,18 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
             if (ret < 0)
                 return ret;
 
-            c->cascaded_context[1] = sws_getContext(srcW, srcH, tmpFormat,
-                                                    dstW, dstH, dstFormat,
-                                                    flags, srcFilter, dstFilter, c->param);
+            c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
+                                                        dstW, dstH, dstFormat,
+                                                        flags, c->param);
             if (!c->cascaded_context[1])
                 return -1;
+
+            c->cascaded_context[1]->srcRange = c->srcRange;
+            c->cascaded_context[1]->dstRange = c->dstRange;
+            ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter);
+            if (ret < 0)
+                return ret;
+
             return 0;
         }
     }



More information about the ffmpeg-cvslog mailing list