[FFmpeg-cvslog] swscale/utils: override forced-zero formats back to full range

Jan Ekström git at videolan.org
Sun Oct 11 12:59:20 EEST 2020


ffmpeg | branch: master | Jan Ekström <jeebjp at gmail.com> | Sat Oct 10 01:33:27 2020 +0300| [7ea4bcff7b038774b404bad2b9c7112a7855a088] | committer: Jan Ekström

swscale/utils: override forced-zero formats back to full range

Fixes vf_scale outputting RGB AVFrames with limited range flagged
in case either input or output specifically sets the range.

This is the reverse of the logic utilized for RGB and PAL8 content
in sws_setColorspaceDetails.

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

 libswscale/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 832c9f873c..352a8ed116 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1013,8 +1013,8 @@ int sws_getColorspaceDetails(struct SwsContext *c, int **inv_table,
 
     *inv_table  = c->srcColorspaceTable;
     *table      = c->dstColorspaceTable;
-    *srcRange   = c->srcRange;
-    *dstRange   = c->dstRange;
+    *srcRange   = range_override_needed(c->srcFormat) ? 1 : c->srcRange;
+    *dstRange   = range_override_needed(c->dstFormat) ? 1 : c->dstRange;
     *brightness = c->brightness;
     *contrast   = c->contrast;
     *saturation = c->saturation;



More information about the ffmpeg-cvslog mailing list