[FFmpeg-cvslog] swscale/utils: fix changing src/dst range after initializing the context

Michael Niedermayer git at videolan.org
Tue Apr 15 01:04:20 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 14 23:46:15 2014 +0200| [4959a4fcf76e7c595dbb23c4e3bf59abf2e60ea4] | committer: Michael Niedermayer

swscale/utils: fix changing src/dst range after initializing the context

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswscale/utils.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index c8db860..28de7b6 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -983,6 +983,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
 {
     const AVPixFmtDescriptor *desc_dst;
     const AVPixFmtDescriptor *desc_src;
+    int need_reinit = 0;
     memmove(c->srcColorspaceTable, inv_table, sizeof(int) * 4);
     memmove(c->dstColorspaceTable, table, sizeof(int) * 4);
 
@@ -998,9 +999,14 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
     c->brightness = brightness;
     c->contrast   = contrast;
     c->saturation = saturation;
+    if (c->srcRange != srcRange || c->dstRange != dstRange)
+        need_reinit = 1;
     c->srcRange   = srcRange;
     c->dstRange   = dstRange;
 
+    if (need_reinit && c->srcBpc == 8)
+        ff_sws_init_range_convert(c);
+
     if ((isYUV(c->dstFormat) || isGray(c->dstFormat)) && (isYUV(c->srcFormat) || isGray(c->srcFormat)))
         return -1;
 



More information about the ffmpeg-cvslog mailing list