[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18677] branches/blender2.5/blender: 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853 :HEAD

Brecht Van Lommel brecht at blender.org
Mon Jan 26 09:35:14 CET 2009


Revision: 18677
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18677
Author:   blendix
Date:     2009-01-26 09:34:40 +0100 (Mon, 26 Jan 2009)

Log Message:
-----------
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/SConstruct
    branches/blender2.5/blender/config/darwin-config.py
    branches/blender2.5/blender/config/irix6-config.py
    branches/blender2.5/blender/config/linux2-config.py
    branches/blender2.5/blender/config/sunos5-config.py
    branches/blender2.5/blender/config/win32-mingw-config.py
    branches/blender2.5/blender/config/win32-vc-config.py
    branches/blender2.5/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/blender2.5/blender/extern/ffmpeg/Makefile
    branches/blender2.5/blender/extern/ffmpeg/SConscript
    branches/blender2.5/blender/extern/ffmpeg/common.mak
    branches/blender2.5/blender/extern/ffmpeg/configure
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/4xm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/8bps.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aac_ac3_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aac_ac3_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aac_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aasc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3tab.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3tab.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/adpcm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/alac.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/allcodecs.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/alpha/asm.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/alpha/regdef.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/apedec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_arm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_arm_s.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_iwmmxt.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/mpegvideo_arm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/simple_idct_arm.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/asv1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/atrac3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/atrac3data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/avcodec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/avs.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bethsoftvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bethsoftvideo.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/config_bfin.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/fdct_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/idct_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bitstream.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bitstream.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bitstream_filter.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bmp.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bmp.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bmpenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bytestream.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/c93.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cabac.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cabac.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavs.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavs.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavsdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavsdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cinepak.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cljr.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/colorspace.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cook.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cookdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cscd.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cyuv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dca.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dca.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dca_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dcadata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dcahuff.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dct-test.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhddata.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhddata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhddec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dpcm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dsicinav.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dsputil.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dsputil.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvbsub.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvbsub_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvbsubdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvdsubdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvdsubenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dxa.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/elbg.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/error_resilience.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/eval.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/eval.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/faandct.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/faandct.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/fft.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ffv1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flac.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flacenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flashsv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flashsvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flicvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/fraps.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/g726.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/gif.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/gifdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/golomb.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264pred.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264pred.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/huffyuv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/cavsdsp_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/cputest.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_h264_template_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_avg.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_qns.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/h264dsp_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/idct_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/idct_mmx_xvid.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/mmx.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/motion_est_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/mpegvideo_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/simple_idct_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_mmx.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_sse2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_sse2.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/idcinvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imcdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imgconvert.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imgconvert_template.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imgresample.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/indeo2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/indeo2data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/indeo3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/indeo3data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/interplayvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpegls.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpeglsdec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpeglsenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/kmvc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lcl.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lcldec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lclenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/liba52.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libamr.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libfaac.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libfaad.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libgsm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libmp3lame.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libvorbis.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libx264.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libxvid_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libxvid_rc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libxvidff.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/loco.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lzw.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lzw.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mace.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mdct.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpeg.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegbdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegdec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegenc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mlib/dsputil_mlib.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mmvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/motion-test.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/motion_est.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/motion_est_template.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpcdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12decdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg4data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg4video_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudio.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodecheader.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodectab.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudioenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiotab.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo_common.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo_enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msmpeg4.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msmpeg4.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msmpeg4data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msmpeg4data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msrle.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msvideo1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/noise_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/nuv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/opt.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/opt.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/os2thread.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pcm.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/png.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/png.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pngdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pngenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pnm.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pnmenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/dsputil_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/dsputil_altivec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/dsputil_ppc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/dsputil_ppc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/fdct_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/fft_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/gcc_fixes.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/gmc_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/h264_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/h264_template_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/idct_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/snow_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/types_altivec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ps2/mmi.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ptx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qdm2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qdm2data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qdrw.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qpeg.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qtrle.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qtrleenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ra144.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ra144.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ra288.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ra288.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rangecoder.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rangecoder.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ratecontrol.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ratecontrol.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/raw.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rawdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rawenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/resample.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/resample2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rl.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rle.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rle.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqaudioenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqvideo.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqvideodec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rpza.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rtjpeg.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rtjpeg.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv10.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/s3tc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/s3tc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sgi.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sgidec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sgienc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/shorten.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/simple_idct.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/simple_idct.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/smacker.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/smc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/snow.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/snow.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sonic.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sp5x.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sp5xdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sparc/dsputil_vis.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sparc/vis.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1_cb.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1_vlc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1enc_cb.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/targa.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/targaenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiertexseqv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiff.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiff.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiffenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/truemotion1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/truemotion1data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/truemotion2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/truespeech.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/truespeech_data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tscc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tta.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/txd.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ulti.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ulti_cb.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/unary.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/utils.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1acdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1dsp.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vcr1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vmdav.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vmnc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_enc_data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp3data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp5.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp5data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp6.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp6data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vqavideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/w32thread.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wavpack.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wma.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmadata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmadec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmaenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmv2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wnv1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ws-snd1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xan.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xiph.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xl.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xsubdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xvmc_render.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xvmcvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/zmbv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/zmbvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/alldevices.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/audio.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/avdevice.h
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/dv1394.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/libdc1394.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/v4l.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/v4l2.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/x11grab.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/4xm.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libavformat/adtsenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/aiff.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/allformats.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/amr.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/apc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ape.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/asf-enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/asf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/asf.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/au.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avformat.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avi.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avidec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avienc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avio.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avio.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/aviobuf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avs.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/bethsoftvid.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/c93.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/daud.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dsicin.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dv.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dxa.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/electronicarts.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ffm.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/file.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/flic.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/flv.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/flvdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/flvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/framehook.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/framehook.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gif.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gifdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gxf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gxfenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/http.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/idcin.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/idroq.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/img2.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ipmovie.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/isom.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/isom.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/libnut.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroska.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroska.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroskadec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroskaenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mm.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mmf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mov.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/movenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mp3.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpeg.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpeg.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpegenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpegts.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpegts.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpegtsenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpjpeg.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mtv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mxf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/network.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nsvdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nut.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nut.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nutdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nutenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nuv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggparseflac.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggparseogm.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggparsetheora.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggparsevorbis.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/os_support.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/os_support.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/psxstr.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/qtpalette.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/raw.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/raw.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/riff.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/riff.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rm.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rmdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rmenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_aac.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_aac.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_h264.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_h264.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_mpv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_mpv.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtpproto.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtsp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtsp.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtspcodes.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/sdp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/segafilm.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/sierravmd.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/smacker.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/sol.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/swf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/tcp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/thp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/tiertexseq.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/tta.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/txd.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/udp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/utils.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/voc.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/vocdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/vocenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/wav.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/wc3movie.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/westwood.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/wv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/yuv4mpeg.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libavutil/adler32.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/adler32.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/aes.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/aes.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/avstring.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/avutil.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/base64.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/base64.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/bswap.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/common.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/crc.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/crc.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/fifo.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/integer.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/integer.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/internal.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/intfloat_readwrite.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/intreadwrite.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lls.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lls.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/log.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/log.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lzo.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lzo.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/mathematics.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/mathematics.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/md5.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/md5.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/mem.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/mem.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/random.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/rational.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/sha1.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/sha1.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/softfloat.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/softfloat.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/tree.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/tree.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/x86_cpu.h
    branches/blender2.5/blender/extern/ffmpeg/libpostproc/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libpostproc/postprocess.c
    branches/blender2.5/blender/extern/ffmpeg/libpostproc/postprocess.h
    branches/blender2.5/blender/extern/ffmpeg/libpostproc/postprocess_altivec_template.c
    branches/blender2.5/blender/extern/ffmpeg/libpostproc/postprocess_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libpostproc/postprocess_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libswscale/cs_test.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/internal_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libswscale/rgb2rgb.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/rgb2rgb.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/rgb2rgb_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale-example.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_altivec_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_mlib.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_vis.c
    branches/blender2.5/blender/extern/libopenjpeg/SConscript
    branches/blender2.5/blender/extern/libopenjpeg/openjpeg.h
    branches/blender2.5/blender/projectfiles_vc9/blender/blender.vcproj
    branches/blender2.5/blender/release/scripts/ac3d_import.py
    branches/blender2.5/blender/release/scripts/animation_bake_constraints.py
    branches/blender2.5/blender/release/scripts/bpymodules/BPyMesh.py
    branches/blender2.5/blender/release/scripts/bpymodules/dxfLibrary.py
    branches/blender2.5/blender/release/scripts/export_fbx.py
    branches/blender2.5/blender/release/scripts/help_bpy_api.py
    branches/blender2.5/blender/release/scripts/help_browser.py
    branches/blender2.5/blender/release/scripts/help_getting_started.py
    branches/blender2.5/blender/release/scripts/help_manual.py
    branches/blender2.5/blender/release/scripts/help_release_notes.py
    branches/blender2.5/blender/release/scripts/help_tutorials.py
    branches/blender2.5/blender/release/scripts/help_web_blender.py
    branches/blender2.5/blender/release/scripts/help_web_devcomm.py
    branches/blender2.5/blender/release/scripts/help_web_eshop.py
    branches/blender2.5/blender/release/scripts/help_web_usercomm.py
    branches/blender2.5/blender/release/scripts/import_web3d.py
    branches/blender2.5/blender/release/scripts/mesh_edges2curves.py
    branches/blender2.5/blender/release/scripts/uvcalc_follow_active_coords.py
    branches/blender2.5/blender/release/scripts/uvcalc_quad_clickproj.py
    branches/blender2.5/blender/release/scripts/vertexpaint_from_material.py
    branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
    branches/blender2.5/blender/source/blender/blenkernel/SConscript
    branches/blender2.5/blender/source/blender/blenkernel/intern/collision.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
    branches/blender2.5/blender/source/blender/blenlib/BLI_arithb.h
    branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
    branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/blenpluginapi/iff.h
    branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
    branches/blender2.5/blender/source/blender/editors/space_file/SConscript
    branches/blender2.5/blender/source/blender/editors/space_file/filelist.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/blender2.5/blender/source/blender/editors/transform/transform_snap.c
    branches/blender2.5/blender/source/blender/gpu/intern/gpu_material.c
    branches/blender2.5/blender/source/blender/imbuf/IMB_imbuf_types.h
    branches/blender2.5/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/blender2.5/blender/source/blender/imbuf/intern/readimage.c
    branches/blender2.5/blender/source/blender/imbuf/intern/util.c
    branches/blender2.5/blender/source/blender/imbuf/intern/writeimage.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_action_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_actuator_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
    branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
    branches/blender2.5/blender/source/blender/nodes/SConscript
    branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
    branches/blender2.5/blender/source/blender/radiosity/intern/source/radfactors.c
    branches/blender2.5/blender/source/blender/radiosity/intern/source/radrender.c
    branches/blender2.5/blender/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/blender2.5/blender/source/blender/render/intern/source/occlusion.c
    branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
    branches/blender2.5/blender/source/blender/render/intern/source/rendercore.c
    branches/blender2.5/blender/source/blender/render/intern/source/shadeinput.c
    branches/blender2.5/blender/source/creator/creator.c
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.h
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/blender2.5/blender/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/blender2.5/blender/source/gameengine/Expressions/PyObjectPlus.h
    branches/blender2.5/blender/source/gameengine/Expressions/Value.cpp
    branches/blender2.5/blender/source/gameengine/Expressions/Value.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ISensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PythonController.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/Makefile
    branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_IPhysicsController.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/blender2.5/blender/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/blender2.5/blender/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/blender2.5/blender/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/blender2.5/blender/source/gameengine/PyDoc/KX_ActuatorSensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_DelaySensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ILogicBrick.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_ISensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_JoystickSensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_KeyboardSensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_MouseSensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_PropertyActuator.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_PropertySensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_PythonController.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_RandomActuator.py
    branches/blender2.5/blender/source/nan_definitions.mk

Added Paths:
-----------
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/8svx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/adx.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/adxdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/adxenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/vp3_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhdenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/escape124.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/faanidct.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/faanidct.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/huffman.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/huffman.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_h264_template_ssse3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_yasm.asm
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputilenc_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/fft_mmx.asm
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/flacdsp_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/vc1dsp_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/x86inc.asm
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imgconvert.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/intrax8.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/intrax8.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/intrax8dsp.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/intrax8huf.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mimic.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mlp_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mlp_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/movsub_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc7.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc7data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc8.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc8data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc8huff.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg4audio.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg4audio.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/nellymoserdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pcx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/check_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/imgresample_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/imgresample_altivec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/util_altivec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rectangle.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rl2.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv30.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv30data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv30dsp.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv34.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv34.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv34data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv34vlc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv40.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv40data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rv40vlc2.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sunrast.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vb.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmv2.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmv2dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmv2enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/vfwcap.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/asfcrypt.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/asfcrypt.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avc.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/crcenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/eacdata.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/framecrcenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/iff.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/lmlm4.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpc8.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/msnwc_tcp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggdec.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/oggparsespeex.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/pva.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rl2.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rpl.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtpdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtpenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtpenc_h264.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/siff.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/vc1test.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/crc_data.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/des.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/des.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/rc4.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/rc4.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_avoption.c
    branches/blender2.5/blender/release/scripts/scripttemplate_background_job.py
    branches/blender2.5/blender/source/blender/imbuf/intern/IMB_jp2.h
    branches/blender2.5/blender/source/blender/imbuf/intern/jp2.c

Removed Paths:
-------------
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/adx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/mpegvideo_ppc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/audio.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/bktr.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/crc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dv1394.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dv1394.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/libdc1394.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ogg.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ogg2.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ogg2.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/v4l.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/v4l2.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/x11grab.c

Property Changed:
----------------
    branches/blender2.5/blender/extern/ffmpeg/SConscript
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aac_ac3_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aac_ac3_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/aac_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ac3tab.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/apedec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/mpegvideo_armv5te.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/simple_idct_armv5te.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/armv4l/simple_idct_armv6.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/atrac3.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/atrac3data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/audioconvert.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bethsoftvideo.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bethsoftvideo.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/config_bfin.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/fdct_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/idct_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/mpegvideo_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bfin/pixels_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bitstream_filter.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bmp.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bmpenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/bytestream.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/c93.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavs.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavs.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavs_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavsdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavsdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/cavsdsp.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/colorspace.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dca.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dca.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dca_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dcadata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dcahuff.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhddata.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhddata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dnxhddec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dsicinav.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dump_extradata_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvbsub_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvdsub_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dvdsubdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/dxa.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/elbg.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/elbg.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/eval.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flacenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/flashsvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/gif.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/gifdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h261enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h263_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264dspenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264pred.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/h264pred.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/cavsdsp_mmx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_qns.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_mmx.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_sse2.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imcdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/imx_dump_header_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpegls.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpegls.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpeglsdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpeglsdec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/jpeglsenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lcl.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lcldec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lclenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/liba52.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libamr.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libfaac.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libfaad.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libmp3lame.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libtheoraenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libvorbis.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libx264.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libxvid_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libxvid_rc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/libxvidff.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ljpegenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lzw.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lzw.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/lzwenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpeg.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpeg_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpega_dump_header_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegbdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegdec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mjpegenc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/motion-test.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mp3_header_compress_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mp3_header_decompress_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpcdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12decdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg12enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg4video_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpeg4video_parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudio_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodata.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodecheader.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudiodecheader.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegaudioenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo_common.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo_enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/mpegvideo_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msmpeg4.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/msmpeg4data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/noise_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/parser.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/png.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pngdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pngenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pnm.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pnm_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/pnmenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/float_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/h264_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/h264_template_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/int_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/mathops.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/snow_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/types_altivec.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ptx.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/qtrleenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/ratecontrol.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/raw.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rawdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rawenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/remove_extradata_bsf.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rl.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rle.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/rle.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqaudioenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqvideo.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqvideodec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/roqvideoenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/s3tc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/s3tc.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sgi.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sgidec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sgienc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sp5xdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/sparc/simple_idct_vis.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/svq1enc_cb.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/targa.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/targaenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiertexseqv.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiff.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiff.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/tiffenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/txd.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/unary.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1_parser.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1acdata.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vc1dsp.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vmnc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_dec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_enc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vorbis_enc_data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp5.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56data.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp56data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp5data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp6.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/vp6data.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wavpack.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wma.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wma.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/wmaenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xiph.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xiph.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xsubdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/xvmc_render.h
    branches/blender2.5/blender/extern/ffmpeg/libavcodec/zmbvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/alldevices.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/audio.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/avdevice.h
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/beosaudio.cpp
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/bktr.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/dv1394.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/dv1394.h
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/libdc1394.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/v4l.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/v4l2.c
    branches/blender2.5/blender/extern/ffmpeg/libavdevice/x11grab.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/apc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/ape.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/avisynth.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/bethsoftvid.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/c93.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dsicin.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dvenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/dxa.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/flv.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gxf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gxf.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/gxfenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/isom.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/isom.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/libnut.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroska.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroskadec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/matroskaenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpeg.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mpegenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mtv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/mxf.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/network.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nut.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nutdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/nutenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/raw.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/riff.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/riff.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rm.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rmdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rmenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_aac.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_aac.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_h264.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_h264.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_mpv.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/rtp_mpv.h
    branches/blender2.5/blender/extern/ffmpeg/libavformat/sdp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/thp.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/tiertexseq.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/txd.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/vocdec.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/vocenc.c
    branches/blender2.5/blender/extern/ffmpeg/libavformat/wv.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/adler32.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/adler32.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/aes.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/aes.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/avstring.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/base64.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/base64.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/fifo.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/fifo.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/internal.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/intreadwrite.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lls.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lls.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/log.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/log.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lzo.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/lzo.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/md5.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/md5.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/mem.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/mem.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/random.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/random.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/sha1.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/sha1.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/softfloat.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/softfloat.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/string.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/tree.c
    branches/blender2.5/blender/extern/ffmpeg/libavutil/tree.h
    branches/blender2.5/blender/extern/ffmpeg/libavutil/x86_cpu.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/Makefile
    branches/blender2.5/blender/extern/ffmpeg/libswscale/cs_test.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/internal_bfin.S
    branches/blender2.5/blender/extern/ffmpeg/libswscale/rgb2rgb.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/rgb2rgb.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/rgb2rgb_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale-example.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_altivec_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_internal.h
    branches/blender2.5/blender/extern/ffmpeg/libswscale/swscale_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_altivec.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_bfin.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_mlib.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_template.c
    branches/blender2.5/blender/extern/ffmpeg/libswscale/yuv2rgb_vis.c
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.h
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.h
    branches/blender2.5/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.h
    branches/blender2.5/blender/source/gameengine/PyDoc/BL_ShapeActionActuator.py
    branches/blender2.5/blender/source/gameengine/PyDoc/KX_ActuatorSensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/KX_ParentActuator.py
    branches/blender2.5/blender/source/gameengine/PyDoc/KX_PolyProxy.py
    branches/blender2.5/blender/source/gameengine/PyDoc/KX_StateActuator.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_DelaySensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SCA_JoystickSensor.py
    branches/blender2.5/blender/source/gameengine/PyDoc/SConscript
    branches/blender2.5/blender/source/gameengine/PyDoc/epy_docgen.sh
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-01-26 08:34:40 UTC (rev 18677)
@@ -175,7 +175,7 @@
 
   SET(FFMPEG /usr)
   SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avformat avcodec avutil)
+  SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
   SET(JPEG_LIB jpeg)

Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/SConstruct	2009-01-26 08:34:40 UTC (rev 18677)
@@ -113,6 +113,7 @@
 		env.Tool('mstoolkit', ['tools'])
 	else:
 		env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+		# xxx commented out, as was supressing warnings under mingw..
 		#if env:
 		#	btools.SetupSpawn(env)
 else:
@@ -323,10 +324,15 @@
 				print "remove file %s"%(B.root_build_dir+entry)
 				os.remove(B.root_build_dir+entry)
 		for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
-				'extern/xvidcore/build/generic/platform.inc']:
+				'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']:
 			if os.path.exists(confile):
 				print "clean file %s"%confile
-				os.remove(confile)
+				if os.path.isdir(confile):
+					for root, dirs, files in os.walk(confile):
+						for name in files:
+							os.remove(os.path.join(root, name))
+				else:
+					os.remove(confile)
 		print B.bc.OKGREEN+'...done'+B.bc.ENDC
 	else:
 		print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC

Modified: branches/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/config/darwin-config.py	2009-01-26 08:34:40 UTC (rev 18677)
@@ -40,7 +40,11 @@
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
 BF_FFMPEG = "#extern/ffmpeg"
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements
+#         To keep Blender compatible with older versions, I add ${BF_FFMPEG} to the inc dir so that ffmpeg
+#         finds the files directly in extern/ffmpeg/libav... while blender finds them in
+#         extern/ffmpeg/include. 
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}'
 if USE_SDK==True:
 	BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
 #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'

Modified: branches/blender2.5/blender/config/irix6-config.py
===================================================================
--- branches/blender2.5/blender/config/irix6-config.py	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/config/irix6-config.py	2009-01-26 08:34:40 UTC (rev 18677)
@@ -142,7 +142,7 @@
 WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
 # Uncomment the following two lines to use system's ffmpeg
 BF_FFMPEG = LCGDIR+'/ffmpeg'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil faad faac vorbis x264 ogg mp3lame z'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice faad faac vorbis x264 ogg mp3lame z'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
@@ -155,7 +155,7 @@
 WITH_BF_OPENJPEG = 'false' 
 BF_OPENJPEG = '#extern/libopenjpeg'
 BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
 BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
 WITH_BF_REDCODE = 'false'  

Modified: branches/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/config/linux2-config.py	2009-01-26 08:34:40 UTC (rev 18677)
@@ -136,8 +136,13 @@
 BF_FFMPEG_LIB = ''
 # Uncomment the following two lines to use system's ffmpeg
 # BF_FFMPEG = '/usr'
-# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements
+#         To keep Blender compatible with older version, I add ${BF_FFMPEG} to the inc dir so that ffmpeg
+#         finds the files directly in extern/ffmpeg/libav... while blender finds them in
+#         extern/ffmpeg/include. When using system ffmpeg, you don't need that, assuming the system library
+#         still use the flat directory model, otherwise will not compile anyway
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
@@ -149,13 +154,14 @@
 WITH_BF_OPENJPEG = True 
 BF_OPENJPEG = '#extern/libopenjpeg'
 BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
 BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
 WITH_BF_REDCODE = False  
 BF_REDCODE = '#extern/libredcode'
 BF_REDCODE_LIB = ''
-BF_REDCODE_INC = '${BF_REDCODE}/include'
+# BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
 BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
 
 # Mesa Libs should go here if your using them as well....

Modified: branches/blender2.5/blender/config/sunos5-config.py
===================================================================
--- branches/blender2.5/blender/config/sunos5-config.py	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/config/sunos5-config.py	2009-01-26 08:34:40 UTC (rev 18677)
@@ -131,7 +131,7 @@
 BF_FFMPEG = '/usr/local'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat avcodec avutil'
+BF_FFMPEG_LIB = 'avformat avcodec avutil avdevice'
 
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = False

Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/config/win32-mingw-config.py	2009-01-26 08:34:40 UTC (rev 18677)
@@ -3,10 +3,12 @@
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
+WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python25'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
@@ -18,7 +20,7 @@
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
 WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264'
+BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
 BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
 

Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/config/win32-vc-config.py	2009-01-26 08:34:40 UTC (rev 18677)
@@ -150,6 +150,10 @@
 BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
 
 WITH_BF_OPENJPEG = True 
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
 WITH_BF_REDCODE = False  
 BF_REDCODE_INC = '#extern'

Modified: branches/blender2.5/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp	2009-01-26 08:34:40 UTC (rev 18677)
@@ -49,8 +49,6 @@
 	child.m_childShapeType = shape->getShapeType();
 	child.m_childMargin = shape->getMargin();
 
-	m_children.push_back(child);
-
 	//extend the local aabbMin/aabbMax
 	btVector3 localAabbMin,localAabbMax;
 	shape->getAabb(localTransform,localAabbMin,localAabbMax);
@@ -69,10 +67,11 @@
 	if (m_dynamicAabbTree)
 	{
 		const btDbvtVolume	bounds=btDbvtVolume::FromMM(localAabbMin,localAabbMax);
-		int index = m_children.size()-1;
+		int index = m_children.size();
 		child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index);
 	}
 
+	m_children.push_back(child);
 }
 
 void btCompoundShape::removeChildShapeByIndex(int childShapeIndex)

Modified: branches/blender2.5/blender/extern/ffmpeg/Makefile
===================================================================
--- branches/blender2.5/blender/extern/ffmpeg/Makefile	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/extern/ffmpeg/Makefile	2009-01-26 08:34:40 UTC (rev 18677)
@@ -32,10 +32,10 @@
 
 include nan_subdirs.mk
 
-ALLDIRS = libavcodec libavformat libavutil libswscale
+ALLDIRS = libavcodec libavformat libavutil libswscale libavdevice
 
 config::
-	./configure --disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads 
+	./configure --disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads 
 all::
 	@for i in $(ALLDIRS); do \
 	    echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\

Modified: branches/blender2.5/blender/extern/ffmpeg/SConscript
===================================================================
--- branches/blender2.5/blender/extern/ffmpeg/SConscript	2009-01-26 06:31:06 UTC (rev 18676)
+++ branches/blender2.5/blender/extern/ffmpeg/SConscript	2009-01-26 08:34:40 UTC (rev 18677)
@@ -3,16 +3,18 @@
 
 Import('env')
 
-all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil']
+all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil', 'libavdevice']

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list