Skip to content
Commit 9affc823 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 502-masa-hits-assert-in-check_ind_list_limits-at-bitrates-160k-256k

# Conflicts:
#	lib_com/options.h
parents 24f08b26 343bb6a7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment