Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pipelines update for FFmpeg 5 and security fixes #756

Merged
merged 5 commits into from
Dec 20, 2022

Conversation

asmorkalov
Copy link
Collaborator

No description provided.

perl -wpe 'BEGIN {our ($found_blank, $bottle_block);}
if (/(^class )(FfmpegAT4)(\s.*)/) {$_=$1."FfmpegOpencv".$3."\n"; next;}
Copy link
Contributor

@asenyaev asenyaev Dec 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can leave FfmpegOpencv here, because the previous logic was something like $2.Opencv what meant FfmpegOpencv, but wasn’t obvious. Or move back $2.

link to the previous logic (before my changes), notice $2: 602a8be#diff-7d5a84b3617f8aff01b2fc673bb198946e3632d90592fd61d3e3e24ddd6dbf70L74

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@asmorkalov
Copy link
Collaborator Author

Requires opencv/opencv#22965 for the latest numpy

@asmorkalov asmorkalov merged commit 7ebbdc3 into opencv:4.x Dec 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants