[FFmpeg-cvslog] Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:42:58 2012 +0100| [a01fe55077d9627519930ad3e18d79a6682f6132] | committer: Michael Niedermayer

Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
  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 at gmx.at>

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