OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 15:09:36 +0000 (17:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 15:09:36 +0000 (17:09 +0200)
commitd7b8a9a589d94550d2eb2ce4147e69311d6c5745
treeb21f0609adfda35eb15ce79acc4fbaca7f87897b
parent0e097616865ea8a1fa8e63a451a4921336660283
parent620345f930d1775e06f38e20a8e7748dd919af2c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: adpcm: cosmetics: Sort test entries
  fate: adpcm: Add dependencies
  svq3: cosmetics: Drop useless parentheses

Conflicts:
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/svq3.c