diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:14:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:15:10 +0100 |
| commit | c2b658c0e7b7555c5dbf0b05d437fe35b5e9cd84 (patch) | |
| tree | b8750581e34e9a96eb92bdc4e88cb5382b48ad55 /libavcodec/xiph.c | |
| parent | f251409adc046881ddff4d0c2bedeae69ae83675 (diff) | |
| parent | 5891fd017aa7bed4c423b8511090cf8641a0afa4 (diff) | |
| download | ffmpeg-c2b658c0e7b7555c5dbf0b05d437fe35b5e9cd84.tar.gz | |
Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4
* commit '5891fd017aa7bed4c423b8511090cf8641a0afa4':
dvdsubdec: Do not leak on failure path
Conflicts:
libavcodec/dvdsubdec.c
See: 7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions