Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:20:37 +0000 (13:20 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:20:37 +0000 (13:20 +0100)
commitbe52b95d311bb392fe99a6bb3b8db74e255043e3
tree029e7d9893f9f0129953136cc81436ce83c4fa6f
parenta7d5b9f1c3ca2e63b0eb882eabadfa1461d17a2d
parente63e3797a1ed9346f529848e6ba3d27fd2d2cc8d
Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c