Skip to content
Snippets Groups Projects
Commit 642a655f authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'f1d8763a' 


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

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e84194f0 f1d8763a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment