* commit 'c0dc57f1':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>