[FFmpeg-cvslog] Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  3 23:29:20 2014 +0200| [039630631e96cc04d09101acf71756174ce00dad] | committer: Michael Niedermayer

Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

* commit '925c37874b617816b6f460c6f229c18b46548b46':
  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=039630631e96cc04d09101acf71756174ce00dad
---