Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 21:02:02 +0000 (22:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 21:08:59 +0000 (22:08 +0100)
* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
  omadec: check GEOB sizes against buffer size

Conflicts:
libavformat/omadec.c

See: e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0
See: 91e72e35141f590c38985ad0ae3453a4e9e86b8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/omadec.c

Simple merge