diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:34:28 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 21:37:53 +0200 |
commit | a649650a0ea0f6b735084fc0055d574af1600017 (patch) | |
tree | 1c0afad355e8a8f6187b1cd06a5b9b085ea62e8b /libavcodec/ass.c | |
parent | 0d3821a6df9688f06aa3c57049a73250b5b6871c (diff) | |
parent | d90133b77bf69667d10e54de9aae7da223c6876a (diff) | |
download | ffmpeg-a649650a0ea0f6b735084fc0055d574af1600017.tar.gz |
Merge commit 'd90133b77bf69667d10e54de9aae7da223c6876a'
* commit 'd90133b77bf69667d10e54de9aae7da223c6876a':
asvenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass.c')
0 files changed, 0 insertions, 0 deletions