Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 21:58:38 +0000 (23:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 22:02:39 +0000 (00:02 +0200)
commit38b701a3492446d7601336c4938fed2b822aa163
treea078fa4771f33e0808a948a4e1cf3ae50bb22440
parent0b95f01140d0debe5ff6bf54d7490ade7c00421b
parent5b4eb243bce10a3e8345401a353749e0414c54ca
Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'

* commit '5b4eb243bce10a3e8345401a353749e0414c54ca':
  mov: Seek back if overreading an individual atom

Conflicts:
libavformat/mov.c
See: 6093960ae35c8d69c559b5604f683c2ea3f279ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c