Changeset fcca7671 in ffmpeg

Timestamp:

Apr 20, 2015, 3:19:46 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5a284d0

Parents:

f1db9842 (diff), e6fb844f (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> (04/20/15 03:19:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/20/15 03:19:46)

Message:

Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'

• commit 'e6fb844f7b736e72da364032d251283bce9e63ad': Implement shared parsing of INFO tag in Canopus family

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

(No files)