diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:25:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:26:14 +0100 |
| commit | dc84cf241cccf440dbad2e3bf31784be7ff1d0f6 (patch) | |
| tree | 65f16e4ed56413c3ad92669dd53f0504ca5d45cf /libavcodec/xiph.c | |
| parent | 206ca5c7c820a70f227e7efb8bcf0e419c60b7d9 (diff) | |
| parent | 32701252af65014bb68194bb61d67ec1882ae75d (diff) | |
| download | ffmpeg-dc84cf241cccf440dbad2e3bf31784be7ff1d0f6.tar.gz | |
Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
* commit '32701252af65014bb68194bb61d67ec1882ae75d':
xwma: Do not leak on failure path
Conflicts:
libavformat/xwma.c
See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions