git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c5f17e
327c439
)
Merge commit '327c439f811a89d774db9a86f72951d295193e5f'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 29 Oct 2013 18:59:10 +0000
(19:59 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 29 Oct 2013 19:01:00 +0000
(20:01 +0100)
* commit '
327c439f811a89d774db9a86f72951d295193e5f
':
timefilter: Handle memory allocation failure
Conflicts:
libavdevice/jack_audio.c
libavdevice/timefilter.c
See:
6ef30976e00a07ed7c6db54102d2ba50d24c876c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge