Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:50:31 +0000 (14:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:57:14 +0000 (14:57 +0200)
commitbdb4ed963f7ecf919075838a64904fd6e49d07ba
tree1da7dfbb1ba1efc2d322ecde0982cafdfdc3f104
parenta5d67bc796e1f9a2b99b43ea807166b655e4bdbc
parenta7c1689dedd11689edb30088d467ac03f9b8d1cf
Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'

* commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf':
  4xm: check that bits per sample is strictly positive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/4xm.c