Changeset d5ec1ddf in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

db9c1386

Parents:

22ffa539 (diff), 9580818c (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:42:26)

git-committer:

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

Message:

Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

• commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:

ffmpeg.c
ffmpeg.h

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

(No files)