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

Merge commit '89de5157' 


* commit '89de5157':
  dcadec: implement request_channel_layout.

Conflicts:
	libavcodec/dcadec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d1daa71f 89de5157
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 6 deletions
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