Changeset 6e9dbee in ffmpeg

Timestamp:

May 27, 2014, 12:46:56 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a37f2cc5

Parents:

e222cfef (diff), 45fc73ed (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 '45fc73edfe071f9690e8671ed2dc402b1cb02ece'

• commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece': vf_format: rework format list parsing

Conflicts:

libavfilter/vf_format.c

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

(No files)