Skip to content

(3.4) videoio: ffmpeg fixes#19661

Merged
alalek merged 2 commits intoopencv:3.4from
alalek:ffmpeg_fixes_3.4
Mar 2, 2021
Merged

(3.4) videoio: ffmpeg fixes#19661
alalek merged 2 commits intoopencv:3.4from
alalek:ffmpeg_fixes_3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Mar 2, 2021 •
edited
Loading

Warnings example: no-fix / partial fix

force_builders=Custom Win
build_image:Custom Win=ffmpeg-plugin
buildworker:Custom Win=windows-2
test_modules:Custom Win=videoio,python3,java
test_opencl:Custom Win=ON

Xbuild_image:Win64=ffmpeg-plugin-msvs2015
Xbuildworker:Win64=windows-2
Xtest_opencl:Win64=ON

buildworker:Win64 OpenCL=windows-1

alalek
alalek commented Mar 2, 2021
View reviewed changes
modules/videoio/src/cap_ffmpeg_impl.hpp
};

#ifndef __GNUC__
static int _interlockedExchangeAdd(int* addr, int delta)
Copy link
Copy Markdown
Member Author

@alalek alalek Mar 2, 2021

Choose a reason for hiding this comment

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

Not needed anymore. Was used on 2.4 branch.

@alalek alalek merged commit 1c88e1f into opencv:3.4 Mar 2, 2021
@alalek alalek mentioned this pull request Mar 2, 2021
Merged
@alalek alalek mentioned this pull request Apr 9, 2021
Merged
@mshabunin mshabunin mentioned this pull request Apr 16, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mshabunin mshabunin mshabunin approved these changes

Assignees

@mshabunin mshabunin

Labels

bug category: build/install category: videoio

Projects

None yet

Milestone

3.4.14

Development

Successfully merging this pull request may close these issues.

2 participants

@alalek @mshabunin