Merge commit '27c8337e595a058347150269d5c2c48281e4285b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Dec 2012 12:08:53 +0000 (13:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Dec 2012 12:09:30 +0000 (13:09 +0100)
commitdde4832b64c53a680cdf8bf4dfb1694e2b802154
treebf10603465501511eb6587039216607edc67f697
parent1081d78746906ac18283af0087254652498e81ed
parent27c8337e595a058347150269d5c2c48281e4285b
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@gmx.at>
libavcodec/h264.c