From 08aa51105f881f912d7e4e4e4e083cb7732fd4b8 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 3 Jan 2013 22:47:34 +0000
Subject: 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
---
 src/lib/ffmpeg-0.9/avcodec.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg-0.9/avcodec.pas')

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
   );
 
-- 
cgit v1.2.3