2 commits

Author	SHA1	Message	Date
Michael Niedermayer	a2bc6c116d	Merge commit 'c98f3169bf' ... * commit 'c98f3169bf': lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-02-16 02:05:29 +01:00
Tim Walker	c98f3169bf	lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.	2014-02-15 22:24:53 +01:00