Michael Niedermayer 3fc26d8073 Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12' ...

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-04 11:14:38 +01:00

8.9 KiB

Raw Blame History

View Raw