summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-23 22:19:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-23 22:21:12 +0100
commitda304c529b65058c0a001b3bbb18e83539a28d71 (patch)
tree4e40f0cbf5dd2a0dc0270108f89d21c69a9b2333
parente40cdf8604f14feaa41323ae8fdfdf187a257d55 (diff)
parent4c5fa628da099dbb598c93bc4555b8733d2c3035 (diff)
Merge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035'
* commit '4c5fa628da099dbb598c93bc4555b8733d2c3035': mov: Do not compute negative SAR values Conflicts: libavformat/mov.c See: e32b07aea4981719a3e6ce92491349c9547958e1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions