Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 11:52:59 +0000 (12:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 11:52:59 +0000 (12:52 +0100)
commitddb9a24a7f11c448263ef9b163e8425832cb089c
treec5b30aba2e7ad4170b4e885b646ba0a1908eaf66
parentd16079abf473b51be7686d20f8014bb48a095722
parent6c99c92a42add7f6a462114d5a4a53c93c551058
Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'

* commit '6c99c92a42add7f6a462114d5a4a53c93c551058':
  libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag

Conflicts:
libavcodec/version.h

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