[FFmpeg-cvslog] Merge commit 'abb41f19cc10fea09fb16d9ecc9967b2a78cf7b0' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 19:01:17 2013 +0100| [048e28420172ac5c1ae45f492172197dccbc8d00] | committer: Michael Niedermayer

Merge commit 'abb41f19cc10fea09fb16d9ecc9967b2a78cf7b0' into release/0.10

* commit 'abb41f19cc10fea09fb16d9ecc9967b2a78cf7b0':
  nuv: Reset the frame on resize
  nuv: Use av_fast_realloc
  nuv: return meaningful error codes.

Conflicts:
	libavcodec/nuv.c

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

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