[FFmpeg-cvslog] Merge commit '27c8337e595a058347150269d5c2c48281e4285b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 16 13:08:53 2012 +0100| [dde4832b64c53a680cdf8bf4dfb1694e2b802154] | committer: Michael Niedermayer

Merge commit '27c8337e595a058347150269d5c2c48281e4285b'

* commit '27c8337e595a058347150269d5c2c48281e4285b':
  h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
  lavr: move AudioMix struct definition to audio_mix.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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