git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 29 Jun 2013 09:19:37 +0000 (11:19 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 29 Jun 2013 09:37:09 +0000 (11:37 +0200)
commit	3e33db3f652e019c18f5b4c5247396dd18f9a15a
tree	94de682d8863ca44119edc2db4f80562fc01e4cc	tree \| snapshot
parent	c1343897c3c879d8842f06220dd1019fd4f8baf7	commit \| diff
parent	e30b068ef79f604ff439418da07f7e2efd01d4ea	commit \| diff

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>

FFmpeg git repo