Merge commit 'e1b66778b6ee82a192b5895e23c4e135f7269326'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 10:46:28 +0000 (12:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 10:46:28 +0000 (12:46 +0200)
commitff17d8b56ec87fe1516ddd49b0bdea81f22904af
tree78627e21ab001f1e5af5930bfb3fa854114a73b6
parent17c8a069167e055b33813aa9a29220c3563573b7
parente1b66778b6ee82a192b5895e23c4e135f7269326
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>
libavcodec/utils.c