Changeset 4131f21f in ffmpeg

Timestamp:

Aug 6, 2013, 7:13:51 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a59a64cb

Parents:

a7bb12a3 (diff), 612a5049 (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:05:13)

git-committer:

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

Message:

Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'

• commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7': avserver: do not use a static string as a default for a string option

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

(No files)