[FFmpeg-cvslog] Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Dec 17 13:20:37 2015 +0100| [be52b95d311bb392fe99a6bb3b8db74e255043e3] | committer: Hendrik Leppkes

Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'

* commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d':
  avconv: pass the global codec side data to the muxer

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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