[FFmpeg-cvslog] Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 14 10:44:55 2013 +0200| [1dee467d262d5b376fa506a0da5325b12ceea51a] | committer: Michael Niedermayer

Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

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

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dee467d262d5b376fa506a0da5325b12ceea51a
---