Skip to content

Commit

Permalink
clang-format 3ae49b6 and 64b09dc
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Jul 24, 2023
1 parent 3ae49b6 commit c37de50
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
5 changes: 4 additions & 1 deletion src/framework/mlt_tractor.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,10 @@ static int producer_get_image(mlt_frame self,
mlt_properties_set_int(properties, "format", *format);
mlt_properties_set_double(properties, "aspect_ratio", mlt_frame_get_aspect_ratio(frame));
// Pass all required frame properties
mlt_properties_pass_list(properties, frame_properties, "progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");
mlt_properties_pass_list(
properties,
frame_properties,
"progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");

mlt_properties_set_data(properties,
"movit.convert.fence",
Expand Down
1 change: 0 additions & 1 deletion src/modules/avformat/producer_avformat.c
Original file line number Diff line number Diff line change
Expand Up @@ -3491,7 +3491,6 @@ static int audio_codec_init(producer_avformat self, int index, mlt_properties pr
apply_properties(codec_context->priv_data,
properties,
AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM);

}
return self->audio_codec[index] && self->audio_index > -1;
}
Expand Down
8 changes: 5 additions & 3 deletions src/modules/frei0r/transition_frei0r.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ static int transition_get_image(mlt_frame a_frame,
&& (!blend_mode || !strcmp("normal", blend_mode))
// Check if the alpha channel is entirely opaque.
&& mlt_image_rgba_opaque(images[1], *width, *height)) {
if (invert)
{
if (invert) {
error = mlt_frame_get_image(a_frame, image, format, width, height, 0);
} else {
// Pass all required frame properties
mlt_properties_pass_list(a_props, b_props, "progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");
mlt_properties_pass_list(a_props,
b_props,
"progressive,distort,colorspace,full_range,force_full_luma,"
"top_field_first,color_trc");
*image = images[1];
}
} else {
Expand Down
5 changes: 4 additions & 1 deletion src/modules/qt/transition_qtblend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,10 @@ static int get_image(mlt_frame a_frame,
}
if (!hasAlpha) {
// Pass all required frame properties
mlt_properties_pass_list(properties, b_properties, "progressive,distort,colorspace,full_range,force_full_luma,top_field_first,color_trc");
mlt_properties_pass_list(properties,
b_properties,
"progressive,distort,colorspace,full_range,force_full_luma,"
"top_field_first,color_trc");
// Prepare output image
if (b_frame->convert_image && (b_width != request_width || b_height != request_height)) {
mlt_properties_set_int(b_properties, "convert_image_width", request_width);
Expand Down

0 comments on commit c37de50

Please sign in to comment.