diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:25:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 02:25:04 +0200 |
| commit | 6ed8341cb163e4c253449458aa21a0b3aab1e2b6 (patch) | |
| tree | 918a2c8b973f38a28c540984f39c0e2021d6edb3 /libavformat/utils.c | |
| parent | 615e73ab4f8cd85e490c7d141fd710385bfaa8ac (diff) | |
| parent | 0994e142132200c706f704271b5a7ae81d128f5c (diff) | |
| download | ffmpeg-6ed8341cb163e4c253449458aa21a0b3aab1e2b6.tar.gz | |
Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'
* commit '0994e142132200c706f704271b5a7ae81d128f5c':
pthread: Check memory allocation
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions