git.sesse.net Git - ffmpeg/commit

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

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 28 Feb 2014 20:41:19 +0000 (21:41 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 28 Feb 2014 20:41:19 +0000 (21:41 +0100)
commit	fb3c33f3cd6b932badbe61a3e0d5cce9f4e36769
tree	1752b2b23e6f7058133bf844b6c783153350613f	tree \| snapshot
parent	ffb7d7195be6a4f25e81600a2a6a6dadd2a11e18	commit \| diff
parent	4cb6964244fd6c099383d8b7e99731e72cc844b9	commit \| diff

Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'

* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
dcadec: simplify decoding of VQ high frequencies

Conflicts:
configure
libavcodec/dcadec.c

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

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