From a8222a55a6aa905237c9bb53268b1de5f09e62df Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Thu, 21 Apr 2011 14:39:45 -0700 Subject: [PATCH] Fix regression initializing coefficients. --- src/modules/avformat/filter_avcolour_space.c | 5 ++++- src/modules/avformat/producer_avformat.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c index 37f0db15..b8685dcf 100644 --- a/src/modules/avformat/filter_avcolour_space.c +++ b/src/modules/avformat/filter_avcolour_space.c @@ -77,7 +77,7 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u { #if defined(SWSCALE) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(7<<8)+2)) int *coefficients; - const int *new_coefficients = coefficients; + const int *new_coefficients; int full_range; int brightness, contrast, saturation; @@ -101,6 +101,9 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u case 709: new_coefficients = sws_getCoefficients( SWS_CS_ITU709 ); break; + default: + new_coefficients = coefficients; + break; } sws_setColorspaceDetails( context, new_coefficients, full_range, new_coefficients, full_range, brightness, contrast, saturation ); diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index fdfe51b6..97f2df74 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -871,7 +871,7 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u { #if defined(SWSCALE) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(7<<8)+2)) int *coefficients; - const int *new_coefficients = coefficients; + const int *new_coefficients; int full_range; int brightness, contrast, saturation; @@ -895,6 +895,9 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u case 709: new_coefficients = sws_getCoefficients( SWS_CS_ITU709 ); break; + default: + new_coefficients = coefficients; + break; } sws_setColorspaceDetails( context, new_coefficients, full_range, new_coefficients, full_range, brightness, contrast, saturation ); -- 2.39.2