Merge commit '327c439f811a89d774db9a86f72951d295193e5f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 18:59:10 +0000 (19:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 19:01:00 +0000 (20:01 +0100)
commit42bf156e132b2bd48dab982a58ba119518b0eafd
tree8cf236f4e770bc0e01d085cb1c8111dd98866106
parent6c5f17e738a5d8a848fb3f2c5fe21f5ca91a9db9
parent327c439f811a89d774db9a86f72951d295193e5f
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>