[FFmpeg-cvslog] Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 12:43:55 2014 +0100| [bb7be3b763d37c1e869431a76da7a8a2ddf1d9f9] | committer: Michael Niedermayer

Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'

* commit '4d0cd5f58c892276716f46f4b2702915e5018215':
  flvenc: move metadata updates into a single function

Conflicts:
	libavformat/flvenc.c

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

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