Changeset fbc13391 in ffmpeg

Timestamp:

Jun 10, 2014, 4:22:41 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a2faa3d8

Parents:

3a76d7f7 (diff), 5482780a (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> (06/10/14 16:22:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/10/14 16:22:41)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Allow values >31bit for -analyzeduration.

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

(No files)