diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 21:30:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 21:30:47 +0100 |
| commit | 15ed7ca437a89796759390956f117555e703043e (patch) | |
| tree | 3558a4a230d438098aa8868e91a7c87daa70d8d2 /libswresample/audioconvert.c | |
| parent | 5af0a701a1c0356fd1a79671de1cf06974e78d76 (diff) | |
| parent | fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6 (diff) | |
| download | ffmpeg-15ed7ca437a89796759390956f117555e703043e.tar.gz | |
Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'
* commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
xwma: Do not leak on failure path
Conflicts:
libavformat/xwma.c
See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions