Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:12:41 +0000 (22:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:12:41 +0000 (22:12 +0100)
commit4cf4da9dc5814aebe8881d93b4a88f593b774448
tree70a7c6514dd14c1a08e2d0f31d85279961e53504
parent751385fe3f6537b2f9d04d2055d23f49f5196efa
parent5b4797a21db900b7d509660b7a4d49829089b004
Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'

* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/internal.h
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h