Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Jun 2013 08:49:42 +0000 (10:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Jun 2013 08:51:23 +0000 (10:51 +0200)
commit98abe16522be05096800dbf8e2ed4f4d8c9118c5
tree4d6c38c91afdff1eaae29a1aafa7faa9a3647cf6
parent5d509fbdcf6277716414702dc961d33c8e1eedcb
parent720a1de52fb4abd8e0541cdcc7d57cb0044c7d3a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: free the padded last frame during audio encoding properly

See: 7fff3df6b277d4f1ebc504e950c9de56cdc14ddd

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