Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 21:25:37 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 21:57:07 +0000 (22:57 +0100)
commit76b9043e903c96a0bb9793e8809337857c66abff
tree33bc388b410aa619da3e808ff9e24e5d3e2267ea
parentf769671f86ed84a886a4360998ddd7f1fb0bc55d
parentb46b233baffc2076a1a17a264ba9553ae0d4878f
Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'

* commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f':
  filmstripdec: avoid integer overflow

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