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

Conflicts:
	libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>