Merge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 19:56:50 +0000 (21:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 19:56:50 +0000 (21:56 +0200)
commitabae926ef80c8553c732b95649d334b7a91374d3
treeec37d08707415640b4d603d5fa2a6a462a0a333e
parente6c710600e1d474b53e52398969140f79052bfde
parente1f907711a91e5ce19402a1831cfbe8f709b67f7
Merge commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7'

* commit 'e1f907711a91e5ce19402a1831cfbe8f709b67f7':
  h264: factor out common code from init() and init_thread_copy()

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c