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

Merge commit 'c98f3169' 


* commit 'c98f3169':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents fdf8b59b c98f3169
No related branches found
No related tags 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