git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Hendrik Leppkes <h.leppkes@gmail.com>
	Mon, 14 Nov 2016 10:19:25 +0000 (11:19 +0100)
committer	Hendrik Leppkes <h.leppkes@gmail.com>
	Mon, 14 Nov 2016 10:20:15 +0000 (11:20 +0100)
commit	a0bc6b51d4f6d01eb4bcaec5489ca67037687a77
tree	5618d262eea09d2ebcc227ed80a8587906ae7e92	tree \| snapshot
parent	cd70ffaac8b74d88ed1460e10c7e9c02d067e3ca	commit \| diff
parent	e72d6fa08a3c1876109149401753a8d2c736d418	commit \| diff

Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'

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

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

Unnamed repository; edit this file 'description' to name the repository.