git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
f320f2f
0bca618
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 May 2015 15:59:45 +0000
(17:59 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 May 2015 15:59:56 +0000
(17:59 +0200)
* cehoyos/master:
lavfi/cropdetect: Fix cropdetect for > 8 bit input.
lavf/apngenc: Fix png remuxing by using default extension apng.
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge