Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 16:26:08 +0000 (17:26 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 16:26:08 +0000 (17:26 +0100)
commit27558679a1e0738630254d5398c74eb5d7f45c8d
tree30d23b7a32e3a3675e0d8a9220cb1e9a81ce8de3
parent2691a8399f57cb22f18dfb13e3575dc44bebd22e
parent7480d001312d9ba706333ec970264ed9df3f82cb
Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'

* commit '7480d001312d9ba706333ec970264ed9df3f82cb':
  pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavutil/pixfmt.h