Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:22:32 +0000 (11:22 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:22:32 +0000 (11:22 +0100)
commita1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e
tree375f0405f96f79727f303c6feed212a75ad1318b
parent1a5631dc716e61cb3fa60bf44b93c4ca5438f7c9
parent310c55f1799deab395319471a75c528d0fa7b30d
Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'

* commit '310c55f1799deab395319471a75c528d0fa7b30d':
  pixfmt: Document alternative names for smpte 431 and 432

Merged-by: Clément Bœsch <u@pkh.me>
libavutil/pixfmt.h