Changeset b37b0a58 in ffmpeg

Timestamp:

Mar 21, 2015, 6:03:10 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dd186b58

Parents:

44e4a86c (diff), 5bc69f38 (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/21/15 18:03:04)

git-committer:

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

Message:

Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'

• commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04': error_resilience: do not require mbintra/skip tables

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

(No files)