Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 01:05:29 +0000 (02:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 01:05:29 +0000 (02:05 +0100)
commita2bc6c116ddc15af47e092af874a0647d114a9f6
tree6232f821ac4664d831e3a74ccaac67fa2b8664f6
parentfdf8b59b28cbe458ca6933bbb9394936a5fcbf91
parentc98f3169bfb578c1a4e407b44524f0bfa3b4dc0c
Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

* 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>
doc/APIchanges
libavutil/Makefile
libavutil/downmix_info.c
libavutil/downmix_info.h
libavutil/frame.h
libavutil/version.h