[FFmpeg-cvslog] Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 16:41:41 2014 +0200| [3fb754712c8a680f32f9cba43d6176891ea3d240] | committer: Michael Niedermayer

Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2

* commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8':
  vp9: Read the frame size as unsigned

Conflicts:
	libavcodec/vp9.c

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

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