Skip to content
Commit 7178785c authored by Manuel Jander's avatar Manuel Jander
Browse files

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

Merge remote-tracking branch 'origin' into 1464-energy-calculation-in-quantization-gain-estimation-for-mdct-stereo-stereo-mode-decision-not
parents 8fd91e77 291c48d3
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