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

Merge commit '2a06c2a0' 


* commit '2a06c2a0':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
	libavcodec/mpegvideo_enc.c

See: 1e786797
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 72d99c8c 2a06c2a0
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.
Finish editing this message first!
Please register or to comment