Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Nov 2014 10:41:27 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Nov 2014 10:41:30 +0000 (11:41 +0100)
commit9266eb0c620ddc555f9bbc422c31c84bcba6d549
tree93e8abb9cf95829070fd71aa9100e384c36b26a9
parent29d208d5d47b0aafe9460ab035afaf2fcd5e8f6b
parent25ccf5df723c4e933f8cc25f36ba21264ef59a8c
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>