Merge commit '69a930b988ff4f88ae27e4fc24ff6ed116840b5e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:11:06 +0000 (12:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:11:52 +0000 (12:11 +0100)
* commit '69a930b988ff4f88ae27e4fc24ff6ed116840b5e':
  mmvideo: check frame dimensions

See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e
See: 9bafd6a8f6a013c5f45141f596574a9a3fbfb561
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge