git.osdn.net Git - android-x86/external-ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 4 Nov 2013 10:14:38 +0000 (11:14 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 4 Nov 2013 10:14:38 +0000 (11:14 +0100)
commit	3fc26d8073a49c96a0704015ce18f5317d87a739
tree	54e7c6782281bf070c91faf63371a1980e92da38	tree \| snapshot
parent	2a7cbc29a8aa0db2bcee95123a83c13d02f0f753	commit \| diff
parent	38ecc3702dabbea09230f6d6333f59e74f5d1c12	commit \| diff

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>

external/ffmpeg

About OSDN

Find Software

Develop Software

Help