
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8': opus: Factor out imdct15 into a standalone component Conflicts: configure libavcodec/opus_celt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8': opus: Factor out imdct15 into a standalone component Conflicts: configure libavcodec/opus_celt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>