Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 20:58:31 +0000 (21:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 20:59:33 +0000 (21:59 +0100)
commitf61498e1dfbac9f07f826340c00f9caf7235766c
treed5ab0f2f45b390a51bb4d43852e59bde868734f0
parentca4dd3810e20028d100e39bc42ebc39712c70573
parent9e696d2e5ffaa763c564682ec18c3b51b3e5fccc
Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'

Merge only for metadata, functionality had been previously integrated.

* commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc':
  h264: support frame parameter changes during frame-mt

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>