Changeset 3e33db3f in ffmpeg

Timestamp:

Jun 29, 2013, 9:37:09 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

562e8d01

Parents:

c1343897 (diff), e30b068e (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> (06/29/13 09:19:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/29/13 09:37:09)

Message:

Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'

• commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea': wmapro: make sure there is room to store the current packet

The check is replaced by an assert as it is impossible to occur
See: 780d45473c32fa356c8ce385c3ea4692567c3228

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

(No files)