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

Merge commit '4e17946f' 


* commit '4e17946f':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 179527f3 4e17946f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment