Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:41:51 +0000 (01:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:42:33 +0000 (01:42 +0200)
commit1eead877669b04a7f029001bfea8c8c3fd46763d
tree151b6129539d76076daf304e08075e51a30db934
parent1ad36551eca99bab51bfd771488ab0ff3af01323
parent7ba0cedbfeff5671b264d1d7e90777057b5714c6
Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'

* commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6':
  rpza: Fix a buffer size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rpza.c