Merge commit '428b629eb28907738ae98331b9f6c25cc9a8f3c8' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:41:41 +0000 (16:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 14:43:45 +0000 (16:43 +0200)
commit3fb754712c8a680f32f9cba43d6176891ea3d240
tree5f346cc800122f9dacf05bc668b8bcb62b2fa009
parente5294f407a81c2088ce21b5ae35469aff38ce100
parent428b629eb28907738ae98331b9f6c25cc9a8f3c8
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@gmx.at>