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)
* commit 'ded9931d165544c342795a1b66e4777b6e7daeb0':
  rv10: check size of s->mb_width * s->mb_height

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

Simple merge
Simple merge
Simple merge