git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c724c82
20f3cdf
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 25 Nov 2014 03:12:22 +0000
(
04:12
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 25 Nov 2014 03:12:26 +0000
(
04:12
+0100)
* cehoyos/master:
Include config.h from huffyuvdsp.h.
Include stddef from snow_dwt.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge