Changeset 1e16492b in ffmpeg

Timestamp:

Nov 11, 2014, 10:54:52 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dadc1f5e

Parents:

940f5c08 (diff), c6074a30 (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> (11/11/14 22:54:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/11/14 22:54:52)

Message:

Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'

• commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8': opt: Fix the documentation mentioning av_set_string3

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

(No files)