diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:02:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:02:19 +0100 |
| commit | 79f013a206394bfc90bbb72995f5cf8965181f51 (patch) | |
| tree | 3672717aa3736f7fd4dd3aa6abd4394e43aeb104 /libavformat | |
| parent | 3f375950f3c9a9c5cf7cece6c26d3e0e7ce278cf (diff) | |
| parent | 9993a067f6c8c7e7838052ac3146aa6b80dd7e81 (diff) | |
| download | ffmpeg-79f013a206394bfc90bbb72995f5cf8965181f51.tar.gz | |
Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
* commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
lavc: Improve thread locking error message
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions