Changeset b7605905 in ffmpeg

Timestamp:

Mar 6, 2014, 11:38:09 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2fb0027c

Parents:

bba7b6fc (diff), bba2a7cc (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> (03/06/14 11:38:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/06/14 11:38:09)

Message:

Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

• commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb': lavfi: use the correct filter context for logging an error.

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

(No files)