git.sesse.net Git - ffmpeg/commit

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

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 4 Sep 2014 17:46:06 +0000 (19:46 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 4 Sep 2014 17:46:06 +0000 (19:46 +0200)
commit	5a20f1885d3b521afc8c63734cff724da0a87815
tree	0821c4d69bded8920fb886d2937023d758fd59ac	tree \| snapshot
parent	91a8b933fb6d9bf41f5885793bfcc0cb24de6100	commit \| diff
parent	f20518568a77a6138fc74021ce56013ab72907ba	commit \| diff

Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba'

* commit 'f20518568a77a6138fc74021ce56013ab72907ba':
build: Split WMA frequencies into a separate object file

Conflicts:
configure
libavcodec/Makefile

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

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