Merge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:21:08 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:21:52 +0000 (12:21 +0200)
commitbc672a016fa16ed678f1f324b9b5adf0bacd4ac8
treef2e01fa25be9fcf0645cf63518a9eb13a9143465
parent6561aae8a955b9237034a004fc92d7fbb3541491
parent4f03a77e52596cbe9ec179666ddb3e0345a8133a
Merge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'

* commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a':
  oma: refactor seek function

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