Remove hardcoded luma scaling and passing skip_luma_scale to frame.

Luma scaling does not work and passing skip_luma_scale can be done by
setting set.skip_luma_scale on the producer.

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 7657da8c25465f5670684c2efe60150f3b83afb3..99111f9913bc9c8faea369de4ca48eb4439b38e4 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -761,7 +761,6 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
                        width, height, PIX_FMT_RGB24, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
                AVPicture output;
                avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
-               luma = 1;
                set_luma_transfer( context, colorspace, luma );
                sws_scale( context, frame->data, frame->linesize, 0, height,
                        output.data, output.linesize);
@@ -773,7 +772,6 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
                        width, height, PIX_FMT_RGBA, flags | SWS_FULL_CHR_H_INT, NULL, NULL, NULL);
                AVPicture output;
                avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
-               luma = 1;
                set_luma_transfer( context, colorspace, luma );
                sws_scale( context, frame->data, frame->linesize, 0, height,
                        output.data, output.linesize);
@@ -1326,9 +1324,6 @@ exit_get_image:
        else
                mlt_properties_set_int( frame_properties, "top_field_first", this->top_field_first );
 
-       if ( *format == mlt_image_yuv422 && mlt_properties_get_int( properties, "skip_luma_scale" ) )
-               mlt_properties_set_int( frame_properties, "skip_luma_scale", 1 );
-
        return !this->got_picture;
 }