James Almer 6e76c9c450 Merge commit 'a8164323374e86ce5f93759230868c98356833a2' ...

* commit 'a8164323374e86ce5f93759230868c98356833a2':
  pixdesc: Add new SMPTE 431, 432, and 2085 color properties

Conflicts:
    libavcodec/options_table.h
    libavcodec/version.h
    libavutil/pixdesc.c
    libavutil/pixfmt.h
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>

2016-09-28 13:12:18 -03:00

54 KiB

Raw Blame History

View Raw