Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:41:32 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:41:32 +0000 (12:41 +0200)
commit9d8fb23747239f6e747000254c91f0510e4eb1e1
tree6cc403a5ecdd1b38fb2f09a6d012a4eaa0fe8ccf
parentbc672a016fa16ed678f1f324b9b5adf0bacd4ac8
parent9d0b45ade864f3d2ccd8610149fe1fff53c4e937
Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'

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

Conflicts:
libavformat/omadec.c

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