]> git.sesse.net Git - ffmpeg/commit
Merge commit '4dc9f00365853b1239936d771856cf1881b5c5ce'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 10:31:14 +0000 (12:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 10:31:14 +0000 (12:31 +0200)
commitd4f63be92b4a8252c37f9453f4e406b94092e122
tree4f33a62593630e446ede78a5312201bfa67891f6
parenta92bd1901fc0bdae562c2cd5e8b1ceddf1464370
parent4dc9f00365853b1239936d771856cf1881b5c5ce
Merge commit '4dc9f00365853b1239936d771856cf1881b5c5ce'

* commit '4dc9f00365853b1239936d771856cf1881b5c5ce':
  build: Skip libvpx.h if libvpx is not enabled

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/Makefile