Changeset 6eb08783 in ffmpeg

Timestamp:

Mar 7, 2014, 11:21:22 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d1122b7c

Parents:

fabf69f3 (diff), f87a6e50 (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> (03/07/14 23:20:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/07/14 23:21:22)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: fic: Properly handle skip frames

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

(No files)