[FFmpeg-cvslog] Merge commit '327c439f811a89d774db9a86f72951d295193e5f'

Michael Niedermayer git at videolan.org
Tue Oct 29 20:06:37 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 29 19:59:10 2013 +0100| [42bf156e132b2bd48dab982a58ba119518b0eafd] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42bf156e132b2bd48dab982a58ba119518b0eafd
---





More information about the ffmpeg-cvslog mailing list