Changeset bd75651 in ffmpeg

Timestamp:

Nov 4, 2013, 9:46:22 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

988e2e7c

Parents:

aeaca381 (diff), 0a7fef39 (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/04/13 21:19:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/04/13 21:46:22)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: omadec: loosen format probing constraints

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

(No files)