| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 18:59:10 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 19:01:00 (GMT) |
| commit | 42bf156e132b2bd48dab982a58ba119518b0eafd (patch) | |
| tree | 8cf236f4e770bc0e01d085cb1c8111dd98866106 | |
| parent | 6c5f17e738a5d8a848fb3f2c5fe21f5ca91a9db9 (diff) | |
| parent | 327c439f811a89d774db9a86f72951d295193e5f (diff) | |
| download | ffmpeg-42bf156e132b2bd48dab982a58ba119518b0eafd.zip ffmpeg-42bf156e132b2bd48dab982a58ba119518b0eafd.tar.gz ffmpeg-42bf156e132b2bd48dab982a58ba119518b0eafd.tar.bz2 | |
Merge commit '327c439f811a89d774db9a86f72951d295193e5f'
* commit '327c439f811a89d774db9a86f72951d295193e5f':
timefilter: Handle memory allocation failure
Conflicts:
libavdevice/jack_audio.c
libavdevice/timefilter.c
See: 6ef30976e00a07ed7c6db54102d2ba50d24c876c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions