git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
29d208d
25ccf5d
)
Merge remote-tracking branch 'cehoyos/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 20 Nov 2014 10:41:27 +0000
(11:41 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 20 Nov 2014 10:41:30 +0000
(11:41 +0100)
* cehoyos/master:
lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge