projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e40cdf8
4c5fa62
)
Merge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 23 Jan 2015 21:19:21 +0000
(22:19 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 23 Jan 2015 21:21:12 +0000
(22:21 +0100)
* commit '
4c5fa628da099dbb598c93bc4555b8733d2c3035
':
mov: Do not compute negative SAR values
Conflicts:
libavformat/mov.c
See:
e32b07aea4981719a3e6ce92491349c9547958e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge