projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d0f0ac4
b1fcdc0
)
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 23 Oct 2013 07:47:41 +0000
(09:47 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 23 Oct 2013 07:48:20 +0000
(09:48 +0200)
* commit '
b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4
':
nut: Fix unchecked allocations
Conflicts:
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c
See:
55ae13e3deffa21027a44f31b4ae2f53a4fa7426
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge