summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-21 12:07:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-21 12:08:31 +0100
commit9b41bf5c3dcefb95c8329e699f4bdb71ad267e6f (patch)
treeccf30085a7d77d1000f201b6b4d4be58a1a038d6 /libswresample
parent4b55a7e1ce686c786825b2b3e3b5115b5bf55ffa (diff)
parenta982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6 (diff)
Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6': tests: drop bc dependency Conflicts: tests/fate-run.sh See: d47eeff2741a9ad9eb4398c1d844dd4f638d6ee4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions