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

Merge commit 'b339019d' 


* commit 'b339019d':
  dca: Split code for handling the EXSS extension off into a separate file

Conflicts:
	libavcodec/Makefile
	libavcodec/dcadec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6998400c b339019d
No related branches found
No related tags found
No related merge requests found
Expand all 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