Merge commit '5c437fb'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 20:55:58 +0000 (21:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 20:55:58 +0000 (21:55 +0100)
commit751385fe3f6537b2f9d04d2055d23f49f5196efa
tree057e7e51bddc82f69ecde51453dbc97869604f7f
parent847072873c95ccaa5441bdba5a50bc19de2875e0
parent5c437fb672b6f6d1f423f88ef84ad5a60cb63813
Merge commit '5c437fb'

* commit '5c437fb':
  lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/channel_layout.h
libavutil/version.h