Merge commit 'ded9931d165544c342795a1b66e4777b6e7daeb0' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:47:33 +0000 (13:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:47:49 +0000 (13:47 +0100)
commit0baea332cb42c254ee57a91a6c0cc36874c44621
tree78806ca1edee34e7fe919ead7a44dfc13e8d3f8b
parent396b47d2a71797e77ad22567b5f2f1ac9874ee51
parentded9931d165544c342795a1b66e4777b6e7daeb0
Merge commit 'ded9931d165544c342795a1b66e4777b6e7daeb0' into release/1.1

* commit 'ded9931d165544c342795a1b66e4777b6e7daeb0':
  rv10: check size of s->mb_width * s->mb_height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10enc.c