Merge commit '5b4eb243'
* commit '5b4eb243': mov: Seek back if overreading an individual atom Conflicts: libavformat/mov.c See: 6093960aMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '5b4eb243': mov: Seek back if overreading an individual atom Conflicts: libavformat/mov.c See: 6093960aMerged-by:Michael Niedermayer <michaelni@gmx.at>