Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 10:19:25 +0000 (11:19 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 10:20:15 +0000 (11:20 +0100)
commita0bc6b51d4f6d01eb4bcaec5489ca67037687a77
tree5618d262eea09d2ebcc227ed80a8587906ae7e92
parentcd70ffaac8b74d88ed1460e10c7e9c02d067e3ca
parente72d6fa08a3c1876109149401753a8d2c736d418
Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'

* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
  build: Move MP2 muxer declaration away from MP3 muxer code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/Makefile
libavformat/Makefile
libavformat/mp3enc.c
libavformat/rawenc.c