diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:46:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:46:56 +0200 |
| commit | 211dcdca5cd98173b76ea219a119c412b6ba8635 (patch) | |
| tree | e1962225ecef547c477b9aab07e28448ca884f9f /Changelog | |
| parent | 1dc58965fd0f430c6020622842ff174feb352a7f (diff) | |
| parent | 522d971c7f5921bebcea2fc50e67056afdabb951 (diff) | |
| download | ffmpeg-211dcdca5cd98173b76ea219a119c412b6ba8635.tar.gz | |
Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'
* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
xsub: Check memory allocation
Conflicts:
libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions