git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Wed, 19 Dec 2012 13:55:07 +0000 (14:55 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Wed, 19 Dec 2012 14:44:59 +0000 (15:44 +0100)
commit	642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca
tree	b09ea65812ccdada345d88802afa71016e1b357e	tree \| snapshot
parent	e84194f06024892fc33684c5a1726c97a0c0a45c	commit \| diff
parent	f1d8763a02b5fce9a7d9789e049d74a45b15e1e8	commit \| diff

Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
mpegvideo: allocate scratch buffers after linesize is known

Conflicts:
libavcodec/mpegvideo.c

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

Unnamed repository; edit this file 'description' to name the repository.