Merge commit '925c37874b617816b6f460c6f229c18b46548b46'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:29:20 +0000 (23:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:29:20 +0000 (23:29 +0200)
commit039630631e96cc04d09101acf71756174ce00dad
treea4f16925f82c2cca8fe993e7d6146f63aa894355
parent0c06ca7a8ab46df0268d049e7c2067ef29a5f77d
parent925c37874b617816b6f460c6f229c18b46548b46
Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

* commit '925c37874b617816b6f460c6f229c18b46548b46':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

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