Changeset a59a64cb in ffmpeg

Timestamp:

Aug 6, 2013, 7:20:22 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bb5ef961

Parents:

4131f21f (diff), 06cd4c5a (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> (08/06/13 07:20:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/06/13 07:20:22)

Message:

Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'

• commit '06cd4c5a68e23f5be199c0d2d563da80989f839f': avconv: fix usage of deprecated lavfi API

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

(No files)