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)
* qatar/master:
  lavc: free the padded last frame during audio encoding properly

See: 7fff3df6b277d4f1ebc504e950c9de56cdc14ddd

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

Trivial merge