-
Michael Niedermayer authored
* commit 'c2319876': mov: Make sure the read sample count is nonnegative Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
143a19f5
* commit 'c2319876': mov: Make sure the read sample count is nonnegative Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>