Merge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:22:20 +0000 (12:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:25:51 +0000 (12:25 +0200)
* commit '5268bd2900effa59b51e0fede61aacde5e2f0b95':
  segafilm: Error out on impossible packet size

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

Simple merge