diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba13dc1af..af886102f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,21 +16,3 @@ of code comments, including Javadoc in header files. Feel free to reach out via an issue or pull request if you have questions about the architecture or implementation details. -### Code Standards - -In order to keep the code as readable and maintainable as possible, code -submitted should abide by the following standards: - -* The code style generally follows the - [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) - including, but not limited to: - * Indentation is 4 spaces wide, spaces only (no tabs) - * `lowercase_underscored_variable_names` - * `lowercase_underscored_functions()` or `SentenceCaseFunctions()` - * `class SentenceCaseClassesAndStructs {}` - * `kSentenceCaseConstants` prepended with a lowercase `k` - * `UPPERCASE_UNDERSCORED_MACROS` for variables or same style as functions for macro functions - * `class_member_variables_` end with a `_` -* 100 column limit (where it doesn't impair readability) -* Unix line endings (only LF no CRLF) -* Javadoc documentation where appropriate diff --git a/README.md b/README.md index 9b5b5e3b1..94424ea42 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Unfortunately, the original author has not submitted code updates for over 7 mon Now, we are maintaining a community edition for this project. ![screen](https://olivevideoeditor.org/img/020-2.png) +This project could now be successfully built with ffmpeg 7. I'm working for a plugin system for it. **NOTE: Olive is alpha software and is considered highly unstable. While we highly appreciate users testing and providing usage information, please use at your own risk.**