1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer 1e4e497911 Merge remote-tracking branch 'qatar/master'
* 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>
2012-11-06 15:11:53 +01:00
..
2012-10-18 13:12:28 +01:00
2012-11-04 19:11:26 +00:00
2012-10-31 12:07:11 +01:00
2012-11-05 11:22:53 +00:00
2012-11-04 19:11:26 +00:00
2012-11-05 15:32:30 -05:00
2012-10-15 08:32:34 +02:00
2012-10-18 13:12:28 +01:00
2012-10-23 02:19:38 +02:00
2012-10-18 13:12:28 +01:00
2012-11-05 02:20:52 +01:00