[FFmpeg-cvslog] Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 11:14:38 2013 +0100| [3fc26d8073a49c96a0704015ce18f5317d87a739] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fc26d8073a49c96a0704015ce18f5317d87a739
---