Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:32:24 +0000 (12:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:32:24 +0000 (12:32 +0200)
commitcfa909ef5b7e0320f75cca10d932631fb03b49af
treee3ad2ea6deac02715bc7640108d0e40825184677
parenta444ddff03861b092558aa0b1b38b218fc636aaa
parent0ef1660a6365ce60ead8858936b6f3f8ea862826
Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'

* commit '0ef1660a6365ce60ead8858936b6f3f8ea862826':
  sierravmd: Do sanity checking of frame sizes

Conflicts:
libavformat/sierravmd.c

See: 47c4713a23d271eedd2eb2c02daa70cb0ea4e0ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/sierravmd.c