* commit '1c736bed':
  omadec: check GEOB sizes against buffer size

Conflicts:
	libavformat/omadec.c

See: e74fa25c
See: 91e72e35Merged-by: Michael Niedermayer <michaelni@gmx.at>