Changeset 5c99ca22 in ffmpeg

Timestamp:

Oct 10, 2013, 10:21:15 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3fa4c528

Parents:

7acb464f (diff), 44690dfa (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> (10/10/13 10:14:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/10/13 10:21:15)

Message:

Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'

• commit '44690dfa683f620c77e9f0e8e9bc5682608636b1': prores: Add a codepath for decoding errors

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

(No files)