aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffserver.texi
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-11-13 18:32:07 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-11-13 18:35:28 +0100
commit2d7cf6f72ba20479109799e4cc9169b95e1b643d (patch)
tree353301a565126b196688eb1c692bed1da4f5a1e9 /doc/ffserver.texi
parent724a71dced1c211fc64105ec9f1fb99d79f6ff35 (diff)
parentf172e22d6aed0bff36e975bafb0183b6779f9444 (diff)
downloadffmpeg-2d7cf6f72ba20479109799e4cc9169b95e1b643d.tar.gz
Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'
* commit 'f172e22d6aed0bff36e975bafb0183b6779f9444': pixdesc: Add aliases to SMPTE color properties Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'doc/ffserver.texi')
0 files changed, 0 insertions, 0 deletions