Changeset 66f379da in ffmpeg

Timestamp:

Dec 5, 2014, 11:52:42 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8616c5b7

Parents:

03abf55f (diff), b72727a5 (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> (12/05/14 23:51:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/05/14 23:52:42)

Message:

Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'

• commit 'b72727a5248f1ef02db99b378dce1eb48a46357a': lavc: mention that the parser callback never returns an error

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

(No files)