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

Include ffmpeg in CMake build #3683

Merged
merged 2 commits into from
Nov 16, 2024
Merged

Conversation

Linvail
Copy link
Contributor

@Linvail Linvail commented Nov 16, 2024

  • Also fix a build error in bflib_fmvids.cpp. This file includes local headers before C/C++ standard headers, so that our true/false definitions conflict with the ones in C++. This problem only occurs in std::optional when you enable C++17.

The best way to fix this should be removing our true/false definitions since they are provided in stdbool.h in C99.

Also remove our useless NULL definition.

Type: New Feature
Change-Id: I7435c628fe970e402ef8fdcf2051385c88689318

* Also fix a build error in bflib_fmvids.cpp.
This file includes local headers before C/C++ standard headers, so that
our true/false definitions conflict with the ones in C++.
This problem only occurs in std::optional when you enable C++17.

The best way to fix this should be removing our true/false definitions
since they are provided in stdbool.h in C99.

Also remove our useless NULL definition.

Type: New Feature
Change-Id: I7435c628fe970e402ef8fdcf2051385c88689318
@Linvail Linvail self-assigned this Nov 16, 2024
Per-file warning treatment is suitable to be put within the file.

Type: Code Improvement
Change-Id: I6957f0e29f49865049642be111cda2bbf63d455a
Copy link
Member

@Loobinex Loobinex left a comment

Choose a reason for hiding this comment

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

I am fine with it and would merge. You asked xtremeqg too, so I will wait for him to respond then merge.

@Linvail Linvail removed the request for review from xtremeqg November 16, 2024 17:18
@Loobinex Loobinex merged commit 64c1af8 into dkfans:master Nov 16, 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.

2 participants