[FFmpeg-cvslog] Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 12:41:32 2013 +0200| [9d8fb23747239f6e747000254c91f0510e4eb1e1] | committer: Michael Niedermayer

Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'

* commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937':
  oma: check geob tag boundary

Conflicts:
	libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d8fb23747239f6e747000254c91f0510e4eb1e1
---