mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-11-17 18:02:23 +03: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>