diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-23 15:55:43 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-23 15:55:43 +0400 |
| commit | fecfdf6e72bd29c90f6b98d5dbca631469b374ec (patch) | |
| tree | 220eca7683fa0bd192ee24ecc8058845e934c0bb /libavformat/sdp.c | |
| parent | f0bb88e2bc8b20e0181e73ae71b62bcf1eb081b5 (diff) | |
| parent | 0ccf051a9def7095ac45b1dca427b39bcf15608d (diff) | |
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>
Diffstat (limited to 'libavformat/sdp.c')
0 files changed, 0 insertions, 0 deletions