diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:48:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 23:11:34 +0200 |
| commit | 437bdf482e928095c1b43681cfeb231a5d2cd5d6 (patch) | |
| tree | 16f31ae83fed7cd207aab85f317a875cdd14116b /libavcodec/tta.c | |
| parent | c180f0f6d3981a93242c3ecabd6667434434ea03 (diff) | |
| parent | 18db1286b04557aa2d2df7efbcb65ae825d5a469 (diff) | |
| download | ffmpeg-437bdf482e928095c1b43681cfeb231a5d2cd5d6.tar.gz | |
Merge commit '18db1286b04557aa2d2df7efbcb65ae825d5a469'
* commit '18db1286b04557aa2d2df7efbcb65ae825d5a469':
libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe
Conflicts:
libavcodec/libxvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tta.c')
0 files changed, 0 insertions, 0 deletions