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

Merge commit '38ecc370' 


* commit '38ecc370':
  pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

Conflicts:
	libavcodec/internal.h
	libavcodec/utils.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2a7cbc29 38ecc370
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment