Skip to content
Snippets Groups Projects
Commit ff17d8b5 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'e1b66778'


* commit 'e1b66778':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 17c8a069 e1b66778
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment