Michael Niedermayer ddb9a24a7f Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058' ...

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

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-12-27 12:52:59 +01:00

86 KiB

Raw Blame History

View Raw