Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Sep 2012 11:55:43 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Sep 2012 11:55:43 +0000 (13:55 +0200)
commitfecfdf6e72bd29c90f6b98d5dbca631469b374ec
tree220eca7683fa0bd192ee24ecc8058845e934c0bb
parentf0bb88e2bc8b20e0181e73ae71b62bcf1eb081b5
parent0ccf051a9def7095ac45b1dca427b39bcf15608d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: fix memleak in avcodec_encode_audio2()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c