Skip to content
Snippets Groups Projects
Commit c122e697 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '27245b4e' 


* commit '27245b4e':
  dca: remove embedded downmix coefficient extraction.

Conflicts:
	libavcodec/dcadata.h
	libavcodec/dcadec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a7f88177 27245b4e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment