summaryrefslogtreecommitdiffstats
path: root/libavutil/downmix_info.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'Michael Niedermayer2014-02-161-4/+4
| | | | | | | | | | | * commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c': lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.Tim Walker2014-02-151-0/+38
OpenPOWER on IntegriCloud