Skip to content

Conversation

@chad3814
Copy link
Contributor

rc_buffer_size is missing from the if() but is in the clause. Need this to do crf + bit rate limiting.

@chad3814
Copy link
Contributor Author

ugh I had originally used master as the base for the commit, so then github told me there was a merge conflict but that I could edit it right there, alas I failed at doing that correctly... so 3 commits to add name == "rc_buffer_size" || ...

@ferdnyc
Copy link
Contributor

ferdnyc commented Nov 30, 2019

Ooh, good catch! Makes sense to me, merging.

3 commits to add name == "rc_buffer_size"

No worries, it happens, and the commits are easy enough to squash on merge.

@ferdnyc ferdnyc merged commit 27bfbbc into OpenShot:develop Nov 30, 2019
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