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)
* commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f':
  filmstripdec: avoid integer overflow

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

Simple merge