Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:23:06 +0000 (01:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:23:24 +0000 (01:23 +0100)
commitf2a84d04331d8179a3cac1adcdef9de1b5c3f1e9
tree801cf08605e852d9dbc39446b5015b647273d36a
parentd08db138e2109725ba2963f152b0a2b1fffded1b
parent8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e
Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4

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

Conflicts:
libavcodec/rv10enc.c

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