From 42bf156e132b2bd48dab982a58ba119518b0eafd Mon Sep 17 00:00:00 2001
From: Michael Niedermayer<michaelni@gmx.at>
Date: Tue, 29  Oct  2013  18:59:10  +0000
Subject: 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>
---
--
cgit