mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-08 10:11:04 +08:00

* qatar/master: fate: atrac: Place atrac1 and atrac3 tests in different groups fate: aac: cosmetics: Group AAC LATM tests together x86: avresample: Add missing colons to assembly labels Conflicts: tests/fate/aac.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>