Changeset 61b3b331 in ffmpeg

Timestamp:

Apr 2, 2014, 1:15:19 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

27f77a37

Parents:

45ba9d85 (diff), f1c4a54f (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/02/14 01:14:53)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/02/14 01:15:19)

Message:

Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'

• commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers

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

(No files)