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

5.x merge 4.x #3793

Merged
merged 8 commits into from
Sep 10, 2024
Merged

5.x merge 4.x #3793

merged 8 commits into from
Sep 10, 2024

Conversation

asmorkalov
Copy link
Contributor

OpenCV Extra: opencv/opencv_extra#1209

#3490 from Konano:patch-4
#3784 from cudawarped:cudacodec_videowriter_fix_ts_in_container
#3785 from asmorkalov:as/cartToPolar_no_tuple
#3791 from asmorkalov:as/zxing_warning

Previous "Merge 4.x": #3783

cudawarped and others added 8 commits September 2, 2024 16:07
…fix_ts_in_container

`cudacodec`: update `VideoWriter` to correctly set the PTS inside the encapsulated video stream
Fix(wechat_code): Modify isnan for compatibility with -ffast_math. opencv#3490

fix opencv#3150
Merge with opencv/opencv#23881

Reference: https://stackoverflow.com/questions/7263404/mingw32-stdisnan-with-ffast-math

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
@asmorkalov asmorkalov merged commit a15a0ea into opencv:5.x Sep 10, 2024
9 checks passed
@asmorkalov asmorkalov mentioned this pull request Sep 20, 2024
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.

3 participants