Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7' n2.9-dev
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 13:58:52 +0000 (15:58 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 13:58:52 +0000 (15:58 +0200)
commitcebe51a6255e04b8dcd15fcbab359ed00dbb3ab1
tree0cae1e8ca86b8b3aa399b0786006e78839e05279
parent8ca97b5e4f470cf24fac5e0599dd63c7af142c22
parent9d58639e270f7612874681e0ca30fa461e2667b7
Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7'

* commit '9d58639e270f7612874681e0ca30fa461e2667b7':
  sws: Drop deprecated SWS_CPU_CAPS defines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libswscale/swscale.h
libswscale/version.h