Changeset 22ffa539 in ffmpeg

Timestamp:

May 5, 2014, 1:09:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d5ec1ddf

Parents:

1efc0892 (diff), 01947f07 (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> (05/05/14 13:09:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/05/14 13:09:55)

Message:

Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

• commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11': avconv: remove a useless line

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

(No files)