Changeset a80342fe in ffmpeg

Timestamp:

Jun 6, 2014, 12:01:21 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

97508af2

Parents:

adf4ee4 (diff), d58bcc19 (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/06/14 12:01:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/06/14 12:01:21)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Allow >2G for skip_initial_bytes.

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

(No files)