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

[vpdq] Fix macOS build #1605

Merged
merged 1 commit into from
Jul 26, 2024
Merged

[vpdq] Fix macOS build #1605

merged 1 commit into from
Jul 26, 2024

Conversation

ianwal
Copy link
Contributor

@ianwal ianwal commented Jul 17, 2024

Summary

Clang doesn't like the forward declaration of the templates, so move them to the header file where they should belong.

The current way might actually be ill-formed, but GCC is pretty lax about template stuff in my experience so that's why it may be working.

Changes

  • Fix Clang link error

  • Fix deprecated warning for AVCodecContext::frame_number. This warning is present on the version of libav libraries that ship with Ubuntu 24.04.

  • Remove unnecessary std::bind for spawning hashing threads in VpdqHasher ctor

Test Plan

Local build and CI passes successfully.

Build and regtest pass on M2 Pro macos Sonoma with Clang with FFmpeg 7.0 installed with brew.

Clang doesn't like the forward declaration of the templates.
Copy link
Contributor

@Dcallies Dcallies left a comment

Choose a reason for hiding this comment

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

Apologies for the long delay, I've been traveling.

Thanks again for the fixes!

@Dcallies Dcallies merged commit 308a05c into facebook:main Jul 26, 2024
9 checks passed
@ianwal ianwal mentioned this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants