Changeset 8064c6ac in ffmpeg

Timestamp:

Apr 22, 2014, 11:56:29 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5809c2a9

Parents:

3bf189bb (diff), f9157463 (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/22/14 11:56:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/22/14 11:56:29)

Message:

Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'

• commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video

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

(No files)