mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +00:00
Merge commit '327c439f811a89d774db9a86f72951d295193e5f'
* commit '327c439f811a89d774db9a86f72951d295193e5f':
timefilter: Handle memory allocation failure
Conflicts:
libavdevice/jack_audio.c
libavdevice/timefilter.c
See: 6ef30976e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
42bf156e13