Changeset ff17d8b5 in ffmpeg

Timestamp:

May 18, 2014, 10:46:28 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

68c05185

Parents:

17c8a069 (diff), e1b66778 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)