Changeset fa5410f6 in ffmpeg

Timestamp:

Aug 3, 2013, 7:22:30 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

85fc1a18

Parents:

a8e96383 (diff), 79be2c32 (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/03/13 07:22:24)

git-committer:

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

Message:

Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

• commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c': doc/print_options: Move options headers to a saner place

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

(No files)