* commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7': h264: factor out common code from init() and init_thread_copy() Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>