Merge commit '3f10a779b465fd22d3aec1b744ca8544bc2da970' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 12:01:08 +0000 (13:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 12:01:22 +0000 (13:01 +0100)
commit475d68e0f50140d8a8eb61ab3575d441b31c554b
treedb6c6ef30592ae714dbd9a93f196f1040623ee6b
parent7fd20799d785bd1ad568e6c19462fd710c0c7001
parent3f10a779b465fd22d3aec1b744ca8544bc2da970
Merge commit '3f10a779b465fd22d3aec1b744ca8544bc2da970' into release/2.2

* commit '3f10a779b465fd22d3aec1b744ca8544bc2da970':
  mmvideo: check frame dimensions

See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mmvideo.c