aboutsummaryrefslogtreecommitdiffstats
path: root/doc/faq.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-21 17:09:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-21 17:09:36 +0200
commitd7b8a9a589d94550d2eb2ce4147e69311d6c5745 (patch)
treeb21f0609adfda35eb15ce79acc4fbaca7f87897b /doc/faq.texi
parent0e097616865ea8a1fa8e63a451a4921336660283 (diff)
parent620345f930d1775e06f38e20a8e7748dd919af2c (diff)
downloadffmpeg-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/faq.texi')
0 files changed, 0 insertions, 0 deletions