Changeset 9b41bf5c in ffmpeg

Timestamp:

Feb 21, 2015, 11:08:31 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

621450e7

Parents:

4b55a7e1 (diff), a982c5d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (02/21/15 11:07:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/21/15 11:08:31)

Message:

Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'

• commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6': tests: drop bc dependency

Conflicts:

tests/fate-run.sh

See: d47eeff2741a9ad9eb4398c1d844dd4f638d6ee4
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)