diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 17:09:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 17:09:36 +0200 |
| commit | d7b8a9a589d94550d2eb2ce4147e69311d6c5745 (patch) | |
| tree | b21f0609adfda35eb15ce79acc4fbaca7f87897b /doc | |
| parent | 0e097616865ea8a1fa8e63a451a4921336660283 (diff) | |
| parent | 620345f930d1775e06f38e20a8e7748dd919af2c (diff) | |
| download | ffmpeg-d7b8a9a589d94550d2eb2ce4147e69311d6c5745.tar.gz | |
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>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions