Changeset 82654172 in ffmpeg

Timestamp:
Jul 24, 2013, 9:31:14 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
da0f67b1
Parents:
a550926 (diff), 2f034f2 (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> (07/24/13 09:09:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/24/13 09:31:14)
Message:

Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'

The newly added checks are redundant and thus replaced by asserts

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.