Skip to content
Commit 85b4cab9 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 e0ed1df6 5cb8d86d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment