diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:25:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:26:34 +0100 |
| commit | be41f21a3d6deb2714debe42530a28a6f3ee68d5 (patch) | |
| tree | a728e38530e3867d82b2f22434bc1adb0ad703e3 /doc/libavdevice.texi | |
| parent | b84cd22a6661d5d1b5fc3660d5ade528b4813aea (diff) | |
| parent | cd8f772d0678a90957f4dfd5ce51af9d22e3f212 (diff) | |
| download | ffmpeg-be41f21a3d6deb2714debe42530a28a6f3ee68d5.tar.gz | |
Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
lavc: Add colorimetry values for BT.2020, other non-included ones
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/libavdevice.texi')
0 files changed, 0 insertions, 0 deletions