Changeset ada9b17e in ffmpeg

Timestamp:

Sep 10, 2013, 8:08:38 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

46405813

Parents:

16ae64ce (diff), 8b524ab0 (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.

Message:

Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'

• commit '8b524ab0c43c1767919530abb79d3656113cdc47': movenc: Add a warning message if conflicting options have been specified

Conflicts:

libavformat/movenc.c

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

(No files)