X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_gamma.c;h=e01cc08a8c912d559bac8a89f50a4ed95855a2b2;hb=41fffb7a1b11ad7dc05236043108d8edab1f6b91;hp=213bc3adb72f1a9488ae08e32c114231f58a90a6;hpb=efe08354d45db7bf5478ffa17c35330a3e0d415c;p=melted diff --git a/src/modules/core/filter_gamma.c b/src/modules/core/filter_gamma.c index 213bc3a..e01cc08 100644 --- a/src/modules/core/filter_gamma.c +++ b/src/modules/core/filter_gamma.c @@ -33,10 +33,10 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * { int error = mlt_frame_get_image( this, image, format, width, height, 1 ); - if ( error != 0 && *format == mlt_image_yuv422 ) + if ( error == 0 && *format == mlt_image_yuv422 ) { // Get the gamma value - double gamma = mlt_properties_get_double( mlt_frame_properties( this ), "gamma" ); + double gamma = mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "gamma" ); if ( gamma != 1.0 ) { @@ -67,9 +67,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { - double gamma = mlt_properties_get_double( mlt_filter_properties( this ), "gamma" ); + double gamma = mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "gamma" ); gamma = gamma <= 0 ? 1 : gamma; - mlt_properties_set_double( mlt_frame_properties( frame ), "gamma", gamma ); + mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "gamma", gamma ); mlt_frame_push_get_image( frame, filter_get_image ); return frame; } @@ -83,8 +83,7 @@ mlt_filter filter_gamma_init( char *arg ) if ( this != NULL ) { this->process = filter_process; - mlt_properties_set( mlt_filter_properties( this ), "gamma", arg == NULL ? "1" : arg ); + mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "gamma", arg == NULL ? "1" : arg ); } return this; } -