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

Merge commit 'feaaf5f7' 


* commit 'feaaf5f7':
  nuv: Reset the frame on resize

Conflicts:
	libavcodec/nuv.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 86fe16a7 feaaf5f7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
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