diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 12:46:28 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 12:46:28 +0200 |
commit | ff17d8b56ec87fe1516ddd49b0bdea81f22904af (patch) | |
tree | 78627e21ab001f1e5af5930bfb3fa854114a73b6 /libavcodec/celp_math.c | |
parent | 17c8a069167e055b33813aa9a29220c3563573b7 (diff) | |
parent | e1b66778b6ee82a192b5895e23c4e135f7269326 (diff) | |
download | ffmpeg-ff17d8b56ec87fe1516ddd49b0bdea81f22904af.tar.gz |
Merge commit 'e1b66778b6ee82a192b5895e23c4e135f7269326'
* commit 'e1b66778b6ee82a192b5895e23c4e135f7269326':
lavc: remove the locking code in avcodec_close()
Conflicts:
libavcodec/utils.c
Note, if someone knows of a external codec lib/API, hwaccel or other that requires
locking on its close/free side, please contact ffmpeg-devel.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/celp_math.c')
0 files changed, 0 insertions, 0 deletions