Changeset 720a8d2b in ffmpeg

Timestamp:

Nov 15, 2014, 12:47:39 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ac1735e7

Parents:

e6e61496 (diff), 4b39cc1a (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/15/14 00:45:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/15/14 00:47:39)

Message:

Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'

• commit '4b39cc1a093c239412ded522c4a899744e7f2008': riff: support ProRes in avi (APCN fourcc)

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

(No files)