Michael Niedermayer fecfdf6e72 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>

2012-09-23 13:55:43 +02:00

81 KiB

Raw Blame History

View Raw