Merge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'
authorClément Bœsch <u@pkh.me>
Sun, 9 Apr 2017 13:10:30 +0000 (15:10 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 9 Apr 2017 13:10:30 +0000 (15:10 +0200)
commit63bb3db9aac34940ee4e415fe7bf096a3c0ab2a4
tree38d3b0eb160ed8a759989bf28a3a4a5f31f833cb
parentbc94b9534cbe842204f5a440d05ffb10ff7629c3
parent0fdc9f81a00f0f32eb93c324bad65d8014deb4dd
Merge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'

* commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd':
  build: Add missing hevc_ps dependency for QSV HEVC encoder

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/Makefile