]> git.sesse.net Git - ffmpeg/commit
Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 17:32:07 +0000 (18:32 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 17:35:28 +0000 (18:35 +0100)
commit2d7cf6f72ba20479109799e4cc9169b95e1b643d
tree353301a565126b196688eb1c692bed1da4f5a1e9
parent724a71dced1c211fc64105ec9f1fb99d79f6ff35
parentf172e22d6aed0bff36e975bafb0183b6779f9444
Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'

* commit 'f172e22d6aed0bff36e975bafb0183b6779f9444':
  pixdesc: Add aliases to SMPTE color properties

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h