Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 18:41:10 +0000 (19:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 18:43:25 +0000 (19:43 +0100)
* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
libavcodec/rv10enc.c

See: 2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/rv10enc.c

Simple merge