[FFmpeg-cvslog] Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 21:58:31 2012 +0100| [f61498e1dfbac9f07f826340c00f9caf7235766c] | committer: Michael Niedermayer

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 at gmx.at>

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