--- branches/release-1_2-branch/xvidcore/ChangeLog	2009/05/25 09:25:50	1861
+++ branches/release-1_2-branch/xvidcore/ChangeLog	2009/05/25 09:37:09	1862
@@ -1,6 +1,80 @@
 # Note that this ChangeLog covers only changes to the HEAD branch
 
 ---------------------
+Date: 2009/05/25 11:25:50
+Author: Isibaar
+Branch: release-1_2-branch
+Tag: (none)
+Log:
+back-ported OSX fix and nasm version note from HEAD
+
+Members:
+        doc/README:1.2->1.2.6.1
+        src/dct/x86_asm/fdct_sse2_skal.asm:1.10->1.10.2.2
+
+---------------------
+Date: 2009/05/25 11:03:47
+Author: Isibaar
+Branch: release-1_2-branch
+Tag: (none)
+Log:
+updated IA64 license headers from HEAD
+
+Members:
+        src/dct/ia64_asm/fdct_ia64.s:1.5->1.5.10.1
+        src/dct/ia64_asm/idct_fini.s:1.1->1.1.14.1
+        src/dct/ia64_asm/idct_ia64_ecc.s:1.1->1.1.14.1
+        src/dct/ia64_asm/idct_ia64_gcc.s:1.1->1.1.14.1
+        src/dct/ia64_asm/idct_init.s:1.1->1.1.14.1
+        src/image/ia64_asm/interpolate8x8_ia64.s:1.5->1.5.14.1
+        src/image/ia64_asm/interpolate8x8_ia64_exact.s:1.1->1.1.14.1
+        src/image/x86_asm/colorspace_mmx.inc:1.7->1.7.2.1
+        src/motion/motion.h:1.24->1.24.2.1
+        src/motion/ia64_asm/calc_delta_1.s:1.1->1.1.14.1
+        src/motion/ia64_asm/calc_delta_2.s:1.1->1.1.14.1
+        src/motion/ia64_asm/calc_delta_3.s:1.1->1.1.14.1
+        src/motion/ia64_asm/halfpel8_refine_ia64.s:1.3->1.3.14.1
+        src/motion/ia64_asm/sad_ia64.s:1.7->1.7.10.1
+        src/quant/ia64_asm/quant_h263_ia64.s:1.6->1.6.6.1
+        src/utils/ia64_asm/mem_transfer_ia64.s:1.5->1.5.10.1
+
+---------------------
+Date: 2009/05/25 10:31:15
+Author: Isibaar
+Branch: release-1_2-branch
+Tag: (none)
+Log:
+backport some fixes from HEAD:
+- Add -D_WIN32_IE=0x0501 to vfw makefile
+- Improved YUV<->RGB precision patch
+- RGB24 access violation patch
+- Quotes around path names for MSVC6 project files
+
+Members:
+        build/win32/libxvidcore.dsp:1.15->1.15.2.1
+        build/win32/libxvidcore_static.dsp:1.5->1.5.2.1
+        debian/control:1.2->1.2.2.2
+        src/image/colorspace.c:1.14->1.14.2.1
+        src/image/image.c:1.43->1.43.2.1
+        src/image/x86_asm/colorspace_rgb_mmx.asm:1.10->1.10.2.1
+        vfw/bin/Makefile:1.6->1.6.2.1
+
+---------------------
+Date: 2009/05/25 10:09:23
+Author: Isibaar
+Branch: release-1_2-branch
+Tag: (none)
+Log:
+increase version number to 1.2.2
+add '-arch ppc' for Apple PPC target
+
+Members:
+        build/generic/configure.in:1.25->1.25.2.2
+        debian/changelog:1.2.2.3->1.2.2.4
+        src/xvid.c:1.77.2.4->1.77.2.5
+        src/xvid.h:1.63.2.2->1.63.2.3
+
+---------------------
 Date: 2008/12/02 15:00:09
 Author: Isibaar
 Branch: release-1_2-branch