diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-01-03 22:47:34 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-01-03 22:47:34 +0000 |
| commit | 08aa51105f881f912d7e4e4e4e083cb7732fd4b8 (patch) | |
| tree | 9292ef16ce4217cc60eef17d8b207196088553c5 /src/lib/ffmpeg-0.9/avcodec.pas | |
| parent | 3d1808b5ec93069182b730bb8ab826121ef1b78a (diff) | |
| download | usdx-08aa51105f881f912d7e4e4e4e083cb7732fd4b8.tar.gz usdx-08aa51105f881f912d7e4e4e4e083cb7732fd4b8.tar.xz usdx-08aa51105f881f912d7e4e4e4e083cb7732fd4b8.zip | |
merge with the patches of s_alexander from the new svn repository. prepare for second move to the new repository.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2932 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg-0.9/avcodec.pas')
| -rw-r--r-- | src/lib/ffmpeg-0.9/avcodec.pas | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas index 6a42c474..b00c7260 100644 --- a/src/lib/ffmpeg-0.9/avcodec.pas +++ b/src/lib/ffmpeg-0.9/avcodec.pas @@ -690,7 +690,7 @@ type AVCOL_TRC_UNSPECIFIED = 2, AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG - AVCOL_SPC_SMPTE240M = 7, + AVCOL_TRC_SMPTE240M = 7, AVCOL_TRC_NB ///< Not part of ABI ); |