diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 09:47:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 09:48:20 +0200 |
| commit | 078abccdd6dc3f173e3b420fa66e9b8859827b03 (patch) | |
| tree | 810641d11e003dfd211ddd6622d099d6ca3aa73a /libavformat/gopher.c | |
| parent | d0f0ac426bdf95bc0cd152d8f2fc824cb7ddb7c5 (diff) | |
| parent | b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4 (diff) | |
| download | ffmpeg-078abccdd6dc3f173e3b420fa66e9b8859827b03.tar.gz | |
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
* 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>
Diffstat (limited to 'libavformat/gopher.c')
0 files changed, 0 insertions, 0 deletions