Revision: 17912 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17912 Author: ben2610 Date: 2008-12-17 21:52:39 +0100 (Wed, 17 Dec 2008)
Log Message: ----------- FFmpeg upgrade to revision 12758 (avformat version 52.13): support libavdevice for video capture in VideoTexture module (BGE). Makefile, CMake, scons updated. FFmpeg binaries will have to be rebuilt for certain OS (irix), win32 binaries already up to date. You MUST do a clean rebuild after this patch. Scons users: pay attention that the config/<os>-config.py files have changed, adapt your user-config.py in consequence Revision Links: -------------- http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12758 Modified Paths: -------------- trunk/blender/CMakeLists.txt trunk/blender/SConstruct trunk/blender/config/darwin-config.py trunk/blender/config/irix6-config.py trunk/blender/config/linux2-config.py trunk/blender/config/sunos5-config.py trunk/blender/config/win32-mingw-config.py trunk/blender/extern/ffmpeg/Makefile trunk/blender/extern/ffmpeg/SConscript trunk/blender/extern/ffmpeg/common.mak trunk/blender/extern/ffmpeg/configure trunk/blender/extern/ffmpeg/libavcodec/4xm.c trunk/blender/extern/ffmpeg/libavcodec/8bps.c trunk/blender/extern/ffmpeg/libavcodec/Makefile trunk/blender/extern/ffmpeg/libavcodec/aac_ac3_parser.c trunk/blender/extern/ffmpeg/libavcodec/aac_ac3_parser.h trunk/blender/extern/ffmpeg/libavcodec/aac_parser.c trunk/blender/extern/ffmpeg/libavcodec/aasc.c trunk/blender/extern/ffmpeg/libavcodec/ac3.c trunk/blender/extern/ffmpeg/libavcodec/ac3.h trunk/blender/extern/ffmpeg/libavcodec/ac3_parser.c trunk/blender/extern/ffmpeg/libavcodec/ac3_parser.h trunk/blender/extern/ffmpeg/libavcodec/ac3dec.c trunk/blender/extern/ffmpeg/libavcodec/ac3enc.c trunk/blender/extern/ffmpeg/libavcodec/ac3tab.c trunk/blender/extern/ffmpeg/libavcodec/ac3tab.h trunk/blender/extern/ffmpeg/libavcodec/adpcm.c trunk/blender/extern/ffmpeg/libavcodec/alac.c trunk/blender/extern/ffmpeg/libavcodec/allcodecs.c trunk/blender/extern/ffmpeg/libavcodec/alpha/asm.h trunk/blender/extern/ffmpeg/libavcodec/alpha/regdef.h trunk/blender/extern/ffmpeg/libavcodec/apedec.c trunk/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_arm.c trunk/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_arm_s.S trunk/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_iwmmxt.c trunk/blender/extern/ffmpeg/libavcodec/armv4l/dsputil_iwmmxt_rnd.h trunk/blender/extern/ffmpeg/libavcodec/armv4l/mathops.h trunk/blender/extern/ffmpeg/libavcodec/armv4l/mpegvideo_arm.c trunk/blender/extern/ffmpeg/libavcodec/armv4l/simple_idct_arm.S trunk/blender/extern/ffmpeg/libavcodec/asv1.c trunk/blender/extern/ffmpeg/libavcodec/atrac3.c trunk/blender/extern/ffmpeg/libavcodec/atrac3data.h trunk/blender/extern/ffmpeg/libavcodec/avcodec.h trunk/blender/extern/ffmpeg/libavcodec/avs.c trunk/blender/extern/ffmpeg/libavcodec/bethsoftvideo.c trunk/blender/extern/ffmpeg/libavcodec/bethsoftvideo.h trunk/blender/extern/ffmpeg/libavcodec/bfin/config_bfin.h trunk/blender/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.c trunk/blender/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.h trunk/blender/extern/ffmpeg/libavcodec/bfin/fdct_bfin.S trunk/blender/extern/ffmpeg/libavcodec/bfin/idct_bfin.S trunk/blender/extern/ffmpeg/libavcodec/bfin/mathops.h trunk/blender/extern/ffmpeg/libavcodec/bitstream.c trunk/blender/extern/ffmpeg/libavcodec/bitstream.h trunk/blender/extern/ffmpeg/libavcodec/bitstream_filter.c trunk/blender/extern/ffmpeg/libavcodec/bmp.c trunk/blender/extern/ffmpeg/libavcodec/bmp.h trunk/blender/extern/ffmpeg/libavcodec/bmpenc.c trunk/blender/extern/ffmpeg/libavcodec/bytestream.h trunk/blender/extern/ffmpeg/libavcodec/c93.c trunk/blender/extern/ffmpeg/libavcodec/cabac.c trunk/blender/extern/ffmpeg/libavcodec/cabac.h trunk/blender/extern/ffmpeg/libavcodec/cavs.c trunk/blender/extern/ffmpeg/libavcodec/cavs.h trunk/blender/extern/ffmpeg/libavcodec/cavsdata.h trunk/blender/extern/ffmpeg/libavcodec/cavsdec.c trunk/blender/extern/ffmpeg/libavcodec/cinepak.c trunk/blender/extern/ffmpeg/libavcodec/cljr.c trunk/blender/extern/ffmpeg/libavcodec/colorspace.h trunk/blender/extern/ffmpeg/libavcodec/cook.c trunk/blender/extern/ffmpeg/libavcodec/cookdata.h trunk/blender/extern/ffmpeg/libavcodec/cscd.c trunk/blender/extern/ffmpeg/libavcodec/cyuv.c trunk/blender/extern/ffmpeg/libavcodec/dca.c trunk/blender/extern/ffmpeg/libavcodec/dca.h trunk/blender/extern/ffmpeg/libavcodec/dca_parser.c trunk/blender/extern/ffmpeg/libavcodec/dcadata.h trunk/blender/extern/ffmpeg/libavcodec/dcahuff.h trunk/blender/extern/ffmpeg/libavcodec/dct-test.c trunk/blender/extern/ffmpeg/libavcodec/dnxhddata.c trunk/blender/extern/ffmpeg/libavcodec/dnxhddata.h trunk/blender/extern/ffmpeg/libavcodec/dnxhddec.c trunk/blender/extern/ffmpeg/libavcodec/dpcm.c trunk/blender/extern/ffmpeg/libavcodec/dsicinav.c trunk/blender/extern/ffmpeg/libavcodec/dsputil.c trunk/blender/extern/ffmpeg/libavcodec/dsputil.h trunk/blender/extern/ffmpeg/libavcodec/dv.c trunk/blender/extern/ffmpeg/libavcodec/dvbsub.c trunk/blender/extern/ffmpeg/libavcodec/dvbsub_parser.c trunk/blender/extern/ffmpeg/libavcodec/dvbsubdec.c trunk/blender/extern/ffmpeg/libavcodec/dvdata.h trunk/blender/extern/ffmpeg/libavcodec/dvdsubdec.c trunk/blender/extern/ffmpeg/libavcodec/dvdsubenc.c trunk/blender/extern/ffmpeg/libavcodec/dxa.c trunk/blender/extern/ffmpeg/libavcodec/elbg.h trunk/blender/extern/ffmpeg/libavcodec/error_resilience.c trunk/blender/extern/ffmpeg/libavcodec/eval.c trunk/blender/extern/ffmpeg/libavcodec/eval.h trunk/blender/extern/ffmpeg/libavcodec/faandct.c trunk/blender/extern/ffmpeg/libavcodec/faandct.h trunk/blender/extern/ffmpeg/libavcodec/fft.c trunk/blender/extern/ffmpeg/libavcodec/ffv1.c trunk/blender/extern/ffmpeg/libavcodec/flac.c trunk/blender/extern/ffmpeg/libavcodec/flacenc.c trunk/blender/extern/ffmpeg/libavcodec/flashsv.c trunk/blender/extern/ffmpeg/libavcodec/flashsvenc.c trunk/blender/extern/ffmpeg/libavcodec/flicvideo.c trunk/blender/extern/ffmpeg/libavcodec/fraps.c trunk/blender/extern/ffmpeg/libavcodec/g726.c trunk/blender/extern/ffmpeg/libavcodec/gif.c trunk/blender/extern/ffmpeg/libavcodec/gifdec.c trunk/blender/extern/ffmpeg/libavcodec/golomb.h trunk/blender/extern/ffmpeg/libavcodec/h261.h trunk/blender/extern/ffmpeg/libavcodec/h261data.h trunk/blender/extern/ffmpeg/libavcodec/h261dec.c trunk/blender/extern/ffmpeg/libavcodec/h263.c trunk/blender/extern/ffmpeg/libavcodec/h263.h trunk/blender/extern/ffmpeg/libavcodec/h263_parser.c trunk/blender/extern/ffmpeg/libavcodec/h263_parser.h trunk/blender/extern/ffmpeg/libavcodec/h263data.h trunk/blender/extern/ffmpeg/libavcodec/h263dec.c trunk/blender/extern/ffmpeg/libavcodec/h264.c trunk/blender/extern/ffmpeg/libavcodec/h264.h trunk/blender/extern/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c trunk/blender/extern/ffmpeg/libavcodec/h264_parser.h trunk/blender/extern/ffmpeg/libavcodec/h264data.h trunk/blender/extern/ffmpeg/libavcodec/h264enc.c trunk/blender/extern/ffmpeg/libavcodec/h264pred.c trunk/blender/extern/ffmpeg/libavcodec/h264pred.h trunk/blender/extern/ffmpeg/libavcodec/huffyuv.c trunk/blender/extern/ffmpeg/libavcodec/i386/cavsdsp_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/cputest.c trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_h264_template_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_avg.h trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_qns.h trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h trunk/blender/extern/ffmpeg/libavcodec/i386/h264dsp_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/idct_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/idct_mmx_xvid.c trunk/blender/extern/ffmpeg/libavcodec/i386/mathops.h trunk/blender/extern/ffmpeg/libavcodec/i386/mmx.h trunk/blender/extern/ffmpeg/libavcodec/i386/motion_est_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/mpegvideo_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c trunk/blender/extern/ffmpeg/libavcodec/i386/simple_idct_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_mmx.h trunk/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_sse2.c trunk/blender/extern/ffmpeg/libavcodec/i386/vp3dsp_sse2.h trunk/blender/extern/ffmpeg/libavcodec/idcinvideo.c trunk/blender/extern/ffmpeg/libavcodec/imc.c trunk/blender/extern/ffmpeg/libavcodec/imcdata.h trunk/blender/extern/ffmpeg/libavcodec/imgconvert.c trunk/blender/extern/ffmpeg/libavcodec/imgconvert_template.h trunk/blender/extern/ffmpeg/libavcodec/imgresample.c trunk/blender/extern/ffmpeg/libavcodec/indeo2.c trunk/blender/extern/ffmpeg/libavcodec/indeo2data.h trunk/blender/extern/ffmpeg/libavcodec/indeo3.c trunk/blender/extern/ffmpeg/libavcodec/indeo3data.h trunk/blender/extern/ffmpeg/libavcodec/interplayvideo.c trunk/blender/extern/ffmpeg/libavcodec/jpegls.h trunk/blender/extern/ffmpeg/libavcodec/jpeglsdec.h trunk/blender/extern/ffmpeg/libavcodec/jpeglsenc.c trunk/blender/extern/ffmpeg/libavcodec/kmvc.c trunk/blender/extern/ffmpeg/libavcodec/lcl.h trunk/blender/extern/ffmpeg/libavcodec/lcldec.c trunk/blender/extern/ffmpeg/libavcodec/lclenc.c trunk/blender/extern/ffmpeg/libavcodec/liba52.c trunk/blender/extern/ffmpeg/libavcodec/libamr.c trunk/blender/extern/ffmpeg/libavcodec/libfaac.c trunk/blender/extern/ffmpeg/libavcodec/libfaad.c trunk/blender/extern/ffmpeg/libavcodec/libgsm.c trunk/blender/extern/ffmpeg/libavcodec/libmp3lame.c trunk/blender/extern/ffmpeg/libavcodec/libvorbis.c trunk/blender/extern/ffmpeg/libavcodec/libx264.c trunk/blender/extern/ffmpeg/libavcodec/libxvid_internal.h trunk/blender/extern/ffmpeg/libavcodec/libxvid_rc.c trunk/blender/extern/ffmpeg/libavcodec/libxvidff.c trunk/blender/extern/ffmpeg/libavcodec/loco.c trunk/blender/extern/ffmpeg/libavcodec/lzw.c trunk/blender/extern/ffmpeg/libavcodec/lzw.h trunk/blender/extern/ffmpeg/libavcodec/mace.c trunk/blender/extern/ffmpeg/libavcodec/mathops.h trunk/blender/extern/ffmpeg/libavcodec/mdct.c trunk/blender/extern/ffmpeg/libavcodec/mdec.c trunk/blender/extern/ffmpeg/libavcodec/mjpeg.h trunk/blender/extern/ffmpeg/libavcodec/mjpegbdec.c trunk/blender/extern/ffmpeg/libavcodec/mjpegdec.c trunk/blender/extern/ffmpeg/libavcodec/mjpegdec.h trunk/blender/extern/ffmpeg/libavcodec/mjpegenc.c trunk/blender/extern/ffmpeg/libavcodec/mjpegenc.h trunk/blender/extern/ffmpeg/libavcodec/mlib/dsputil_mlib.c trunk/blender/extern/ffmpeg/libavcodec/mmvideo.c trunk/blender/extern/ffmpeg/libavcodec/motion-test.c trunk/blender/extern/ffmpeg/libavcodec/motion_est.c trunk/blender/extern/ffmpeg/libavcodec/motion_est_template.c trunk/blender/extern/ffmpeg/libavcodec/mpc.c trunk/blender/extern/ffmpeg/libavcodec/mpcdata.h trunk/blender/extern/ffmpeg/libavcodec/mpeg12.c trunk/blender/extern/ffmpeg/libavcodec/mpeg12.h trunk/blender/extern/ffmpeg/libavcodec/mpeg12data.c trunk/blender/extern/ffmpeg/libavcodec/mpeg12data.h trunk/blender/extern/ffmpeg/libavcodec/mpeg12decdata.h trunk/blender/extern/ffmpeg/libavcodec/mpeg12enc.c trunk/blender/extern/ffmpeg/libavcodec/mpeg4data.h trunk/blender/extern/ffmpeg/libavcodec/mpeg4video_parser.h trunk/blender/extern/ffmpeg/libavcodec/mpegaudio.h trunk/blender/extern/ffmpeg/libavcodec/mpegaudiodata.h trunk/blender/extern/ffmpeg/libavcodec/mpegaudiodec.c trunk/blender/extern/ffmpeg/libavcodec/mpegaudiodecheader.h trunk/blender/extern/ffmpeg/libavcodec/mpegaudiodectab.h trunk/blender/extern/ffmpeg/libavcodec/mpegaudioenc.c trunk/blender/extern/ffmpeg/libavcodec/mpegaudiotab.h trunk/blender/extern/ffmpeg/libavcodec/mpegvideo.c trunk/blender/extern/ffmpeg/libavcodec/mpegvideo.h trunk/blender/extern/ffmpeg/libavcodec/mpegvideo_common.h trunk/blender/extern/ffmpeg/libavcodec/mpegvideo_enc.c trunk/blender/extern/ffmpeg/libavcodec/mpegvideo_parser.c trunk/blender/extern/ffmpeg/libavcodec/msmpeg4.c trunk/blender/extern/ffmpeg/libavcodec/msmpeg4.h trunk/blender/extern/ffmpeg/libavcodec/msmpeg4data.c trunk/blender/extern/ffmpeg/libavcodec/msmpeg4data.h trunk/blender/extern/ffmpeg/libavcodec/msrle.c trunk/blender/extern/ffmpeg/libavcodec/msvideo1.c trunk/blender/extern/ffmpeg/libavcodec/noise_bsf.c trunk/blender/extern/ffmpeg/libavcodec/nuv.c trunk/blender/extern/ffmpeg/libavcodec/opt.c trunk/blender/extern/ffmpeg/libavcodec/opt.h trunk/blender/extern/ffmpeg/libavcodec/os2thread.c trunk/blender/extern/ffmpeg/libavcodec/parser.c trunk/blender/extern/ffmpeg/libavcodec/parser.h trunk/blender/extern/ffmpeg/libavcodec/pcm.c trunk/blender/extern/ffmpeg/libavcodec/png.c trunk/blender/extern/ffmpeg/libavcodec/png.h trunk/blender/extern/ffmpeg/libavcodec/pngdec.c trunk/blender/extern/ffmpeg/libavcodec/pngenc.c trunk/blender/extern/ffmpeg/libavcodec/pnm.h trunk/blender/extern/ffmpeg/libavcodec/pnmenc.c trunk/blender/extern/ffmpeg/libavcodec/ppc/dsputil_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/dsputil_altivec.h trunk/blender/extern/ffmpeg/libavcodec/ppc/dsputil_ppc.c trunk/blender/extern/ffmpeg/libavcodec/ppc/dsputil_ppc.h trunk/blender/extern/ffmpeg/libavcodec/ppc/fdct_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/fft_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/gcc_fixes.h trunk/blender/extern/ffmpeg/libavcodec/ppc/gmc_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/h264_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/h264_template_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/idct_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/mathops.h trunk/blender/extern/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/snow_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/types_altivec.h trunk/blender/extern/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ps2/mmi.h trunk/blender/extern/ffmpeg/libavcodec/ptx.c trunk/blender/extern/ffmpeg/libavcodec/qdm2.c trunk/blender/extern/ffmpeg/libavcodec/qdm2data.h trunk/blender/extern/ffmpeg/libavcodec/qdrw.c trunk/blender/extern/ffmpeg/libavcodec/qpeg.c trunk/blender/extern/ffmpeg/libavcodec/qtrle.c trunk/blender/extern/ffmpeg/libavcodec/qtrleenc.c trunk/blender/extern/ffmpeg/libavcodec/ra144.c trunk/blender/extern/ffmpeg/libavcodec/ra144.h trunk/blender/extern/ffmpeg/libavcodec/ra288.c trunk/blender/extern/ffmpeg/libavcodec/ra288.h trunk/blender/extern/ffmpeg/libavcodec/rangecoder.c trunk/blender/extern/ffmpeg/libavcodec/rangecoder.h trunk/blender/extern/ffmpeg/libavcodec/ratecontrol.c trunk/blender/extern/ffmpeg/libavcodec/ratecontrol.h trunk/blender/extern/ffmpeg/libavcodec/raw.h trunk/blender/extern/ffmpeg/libavcodec/rawdec.c trunk/blender/extern/ffmpeg/libavcodec/rawenc.c trunk/blender/extern/ffmpeg/libavcodec/resample.c trunk/blender/extern/ffmpeg/libavcodec/resample2.c trunk/blender/extern/ffmpeg/libavcodec/rl.h trunk/blender/extern/ffmpeg/libavcodec/rle.c trunk/blender/extern/ffmpeg/libavcodec/rle.h trunk/blender/extern/ffmpeg/libavcodec/roqaudioenc.c trunk/blender/extern/ffmpeg/libavcodec/roqvideo.h trunk/blender/extern/ffmpeg/libavcodec/roqvideodec.c trunk/blender/extern/ffmpeg/libavcodec/rpza.c trunk/blender/extern/ffmpeg/libavcodec/rtjpeg.c trunk/blender/extern/ffmpeg/libavcodec/rtjpeg.h trunk/blender/extern/ffmpeg/libavcodec/rv10.c trunk/blender/extern/ffmpeg/libavcodec/s3tc.c trunk/blender/extern/ffmpeg/libavcodec/s3tc.h trunk/blender/extern/ffmpeg/libavcodec/sgi.h trunk/blender/extern/ffmpeg/libavcodec/sgidec.c trunk/blender/extern/ffmpeg/libavcodec/sgienc.c trunk/blender/extern/ffmpeg/libavcodec/shorten.c trunk/blender/extern/ffmpeg/libavcodec/simple_idct.c trunk/blender/extern/ffmpeg/libavcodec/simple_idct.h trunk/blender/extern/ffmpeg/libavcodec/smacker.c trunk/blender/extern/ffmpeg/libavcodec/smc.c trunk/blender/extern/ffmpeg/libavcodec/snow.c trunk/blender/extern/ffmpeg/libavcodec/snow.h trunk/blender/extern/ffmpeg/libavcodec/sonic.c trunk/blender/extern/ffmpeg/libavcodec/sp5x.h trunk/blender/extern/ffmpeg/libavcodec/sp5xdec.c trunk/blender/extern/ffmpeg/libavcodec/sparc/dsputil_vis.c trunk/blender/extern/ffmpeg/libavcodec/sparc/vis.h trunk/blender/extern/ffmpeg/libavcodec/svq1.c trunk/blender/extern/ffmpeg/libavcodec/svq1.h trunk/blender/extern/ffmpeg/libavcodec/svq1_cb.h trunk/blender/extern/ffmpeg/libavcodec/svq1_vlc.h trunk/blender/extern/ffmpeg/libavcodec/svq1dec.c trunk/blender/extern/ffmpeg/libavcodec/svq1enc.c trunk/blender/extern/ffmpeg/libavcodec/svq1enc_cb.h trunk/blender/extern/ffmpeg/libavcodec/svq3.c trunk/blender/extern/ffmpeg/libavcodec/targa.c trunk/blender/extern/ffmpeg/libavcodec/targaenc.c trunk/blender/extern/ffmpeg/libavcodec/tiertexseqv.c trunk/blender/extern/ffmpeg/libavcodec/tiff.c trunk/blender/extern/ffmpeg/libavcodec/tiff.h trunk/blender/extern/ffmpeg/libavcodec/tiffenc.c trunk/blender/extern/ffmpeg/libavcodec/truemotion1.c trunk/blender/extern/ffmpeg/libavcodec/truemotion1data.h trunk/blender/extern/ffmpeg/libavcodec/truemotion2.c trunk/blender/extern/ffmpeg/libavcodec/truespeech.c trunk/blender/extern/ffmpeg/libavcodec/truespeech_data.h trunk/blender/extern/ffmpeg/libavcodec/tscc.c trunk/blender/extern/ffmpeg/libavcodec/tta.c trunk/blender/extern/ffmpeg/libavcodec/txd.c trunk/blender/extern/ffmpeg/libavcodec/ulti.c trunk/blender/extern/ffmpeg/libavcodec/ulti_cb.h trunk/blender/extern/ffmpeg/libavcodec/unary.h trunk/blender/extern/ffmpeg/libavcodec/utils.c trunk/blender/extern/ffmpeg/libavcodec/vc1.c trunk/blender/extern/ffmpeg/libavcodec/vc1.h trunk/blender/extern/ffmpeg/libavcodec/vc1acdata.h trunk/blender/extern/ffmpeg/libavcodec/vc1data.h trunk/blender/extern/ffmpeg/libavcodec/vc1dsp.c trunk/blender/extern/ffmpeg/libavcodec/vcr1.c trunk/blender/extern/ffmpeg/libavcodec/vmdav.c trunk/blender/extern/ffmpeg/libavcodec/vmnc.c trunk/blender/extern/ffmpeg/libavcodec/vorbis.c trunk/blender/extern/ffmpeg/libavcodec/vorbis.h trunk/blender/extern/ffmpeg/libavcodec/vorbis_dec.c trunk/blender/extern/ffmpeg/libavcodec/vorbis_enc.c trunk/blender/extern/ffmpeg/libavcodec/vorbis_enc_data.h trunk/blender/extern/ffmpeg/libavcodec/vp3.c trunk/blender/extern/ffmpeg/libavcodec/vp3data.h trunk/blender/extern/ffmpeg/libavcodec/vp5.c trunk/blender/extern/ffmpeg/libavcodec/vp56.c trunk/blender/extern/ffmpeg/libavcodec/vp56.h trunk/blender/extern/ffmpeg/libavcodec/vp56data.c trunk/blender/extern/ffmpeg/libavcodec/vp56data.h trunk/blender/extern/ffmpeg/libavcodec/vp5data.h trunk/blender/extern/ffmpeg/libavcodec/vp6.c trunk/blender/extern/ffmpeg/libavcodec/vp6data.h trunk/blender/extern/ffmpeg/libavcodec/vqavideo.c trunk/blender/extern/ffmpeg/libavcodec/w32thread.c trunk/blender/extern/ffmpeg/libavcodec/wavpack.c trunk/blender/extern/ffmpeg/libavcodec/wma.h trunk/blender/extern/ffmpeg/libavcodec/wmadata.h trunk/blender/extern/ffmpeg/libavcodec/wmadec.c trunk/blender/extern/ffmpeg/libavcodec/wmaenc.c trunk/blender/extern/ffmpeg/libavcodec/wmv2.c trunk/blender/extern/ffmpeg/libavcodec/wnv1.c trunk/blender/extern/ffmpeg/libavcodec/ws-snd1.c trunk/blender/extern/ffmpeg/libavcodec/xan.c trunk/blender/extern/ffmpeg/libavcodec/xiph.h trunk/blender/extern/ffmpeg/libavcodec/xl.c trunk/blender/extern/ffmpeg/libavcodec/xsubdec.c trunk/blender/extern/ffmpeg/libavcodec/xvmc_render.h trunk/blender/extern/ffmpeg/libavcodec/xvmcvideo.c trunk/blender/extern/ffmpeg/libavcodec/zmbv.c trunk/blender/extern/ffmpeg/libavcodec/zmbvenc.c trunk/blender/extern/ffmpeg/libavdevice/Makefile trunk/blender/extern/ffmpeg/libavdevice/alldevices.c trunk/blender/extern/ffmpeg/libavdevice/audio.c trunk/blender/extern/ffmpeg/libavdevice/avdevice.h trunk/blender/extern/ffmpeg/libavdevice/dv1394.c trunk/blender/extern/ffmpeg/libavdevice/libdc1394.c trunk/blender/extern/ffmpeg/libavdevice/v4l.c trunk/blender/extern/ffmpeg/libavdevice/v4l2.c trunk/blender/extern/ffmpeg/libavdevice/x11grab.c trunk/blender/extern/ffmpeg/libavformat/4xm.c trunk/blender/extern/ffmpeg/libavformat/Makefile trunk/blender/extern/ffmpeg/libavformat/adtsenc.c trunk/blender/extern/ffmpeg/libavformat/aiff.c trunk/blender/extern/ffmpeg/libavformat/allformats.c trunk/blender/extern/ffmpeg/libavformat/amr.c trunk/blender/extern/ffmpeg/libavformat/apc.c trunk/blender/extern/ffmpeg/libavformat/ape.c trunk/blender/extern/ffmpeg/libavformat/asf-enc.c trunk/blender/extern/ffmpeg/libavformat/asf.c trunk/blender/extern/ffmpeg/libavformat/asf.h trunk/blender/extern/ffmpeg/libavformat/au.c trunk/blender/extern/ffmpeg/libavformat/avformat.h trunk/blender/extern/ffmpeg/libavformat/avi.h trunk/blender/extern/ffmpeg/libavformat/avidec.c trunk/blender/extern/ffmpeg/libavformat/avienc.c trunk/blender/extern/ffmpeg/libavformat/avio.c trunk/blender/extern/ffmpeg/libavformat/avio.h trunk/blender/extern/ffmpeg/libavformat/aviobuf.c trunk/blender/extern/ffmpeg/libavformat/avs.c trunk/blender/extern/ffmpeg/libavformat/bethsoftvid.c trunk/blender/extern/ffmpeg/libavformat/c93.c trunk/blender/extern/ffmpeg/libavformat/daud.c trunk/blender/extern/ffmpeg/libavformat/dsicin.c trunk/blender/extern/ffmpeg/libavformat/dv.c trunk/blender/extern/ffmpeg/libavformat/dv.h trunk/blender/extern/ffmpeg/libavformat/dvenc.c trunk/blender/extern/ffmpeg/libavformat/dxa.c trunk/blender/extern/ffmpeg/libavformat/electronicarts.c trunk/blender/extern/ffmpeg/libavformat/ffm.c trunk/blender/extern/ffmpeg/libavformat/file.c trunk/blender/extern/ffmpeg/libavformat/flic.c trunk/blender/extern/ffmpeg/libavformat/flv.h trunk/blender/extern/ffmpeg/libavformat/flvdec.c trunk/blender/extern/ffmpeg/libavformat/flvenc.c trunk/blender/extern/ffmpeg/libavformat/framehook.c trunk/blender/extern/ffmpeg/libavformat/framehook.h trunk/blender/extern/ffmpeg/libavformat/gif.c trunk/blender/extern/ffmpeg/libavformat/gifdec.c trunk/blender/extern/ffmpeg/libavformat/gxf.c trunk/blender/extern/ffmpeg/libavformat/gxfenc.c trunk/blender/extern/ffmpeg/libavformat/http.c trunk/blender/extern/ffmpeg/libavformat/idcin.c trunk/blender/extern/ffmpeg/libavformat/idroq.c trunk/blender/extern/ffmpeg/libavformat/img2.c trunk/blender/extern/ffmpeg/libavformat/ipmovie.c trunk/blender/extern/ffmpeg/libavformat/isom.c trunk/blender/extern/ffmpeg/libavformat/isom.h trunk/blender/extern/ffmpeg/libavformat/libnut.c trunk/blender/extern/ffmpeg/libavformat/matroska.c trunk/blender/extern/ffmpeg/libavformat/matroska.h trunk/blender/extern/ffmpeg/libavformat/matroskadec.c trunk/blender/extern/ffmpeg/libavformat/matroskaenc.c trunk/blender/extern/ffmpeg/libavformat/mm.c trunk/blender/extern/ffmpeg/libavformat/mmf.c trunk/blender/extern/ffmpeg/libavformat/mov.c trunk/blender/extern/ffmpeg/libavformat/movenc.c trunk/blender/extern/ffmpeg/libavformat/mp3.c trunk/blender/extern/ffmpeg/libavformat/mpc.c trunk/blender/extern/ffmpeg/libavformat/mpeg.c trunk/blender/extern/ffmpeg/libavformat/mpeg.h trunk/blender/extern/ffmpeg/libavformat/mpegenc.c trunk/blender/extern/ffmpeg/libavformat/mpegts.c trunk/blender/extern/ffmpeg/libavformat/mpegts.h trunk/blender/extern/ffmpeg/libavformat/mpegtsenc.c trunk/blender/extern/ffmpeg/libavformat/mpjpeg.c trunk/blender/extern/ffmpeg/libavformat/mtv.c trunk/blender/extern/ffmpeg/libavformat/mxf.c trunk/blender/extern/ffmpeg/libavformat/network.h trunk/blender/extern/ffmpeg/libavformat/nsvdec.c trunk/blender/extern/ffmpeg/libavformat/nut.c trunk/blender/extern/ffmpeg/libavformat/nut.h trunk/blender/extern/ffmpeg/libavformat/nutdec.c trunk/blender/extern/ffmpeg/libavformat/nutenc.c trunk/blender/extern/ffmpeg/libavformat/nuv.c trunk/blender/extern/ffmpeg/libavformat/oggparseflac.c trunk/blender/extern/ffmpeg/libavformat/oggparseogm.c trunk/blender/extern/ffmpeg/libavformat/oggparsetheora.c trunk/blender/extern/ffmpeg/libavformat/oggparsevorbis.c trunk/blender/extern/ffmpeg/libavformat/os_support.c trunk/blender/extern/ffmpeg/libavformat/os_support.h trunk/blender/extern/ffmpeg/libavformat/psxstr.c trunk/blender/extern/ffmpeg/libavformat/qtpalette.h trunk/blender/extern/ffmpeg/libavformat/raw.c trunk/blender/extern/ffmpeg/libavformat/raw.h trunk/blender/extern/ffmpeg/libavformat/riff.c trunk/blender/extern/ffmpeg/libavformat/riff.h trunk/blender/extern/ffmpeg/libavformat/rm.h trunk/blender/extern/ffmpeg/libavformat/rmdec.c trunk/blender/extern/ffmpeg/libavformat/rmenc.c trunk/blender/extern/ffmpeg/libavformat/rtp.c trunk/blender/extern/ffmpeg/libavformat/rtp.h trunk/blender/extern/ffmpeg/libavformat/rtp_aac.c trunk/blender/extern/ffmpeg/libavformat/rtp_aac.h trunk/blender/extern/ffmpeg/libavformat/rtp_h264.c trunk/blender/extern/ffmpeg/libavformat/rtp_h264.h trunk/blender/extern/ffmpeg/libavformat/rtp_internal.h trunk/blender/extern/ffmpeg/libavformat/rtp_mpv.c trunk/blender/extern/ffmpeg/libavformat/rtp_mpv.h trunk/blender/extern/ffmpeg/libavformat/rtpproto.c trunk/blender/extern/ffmpeg/libavformat/rtsp.c trunk/blender/extern/ffmpeg/libavformat/rtsp.h trunk/blender/extern/ffmpeg/libavformat/rtspcodes.h trunk/blender/extern/ffmpeg/libavformat/sdp.c trunk/blender/extern/ffmpeg/libavformat/segafilm.c trunk/blender/extern/ffmpeg/libavformat/sierravmd.c trunk/blender/extern/ffmpeg/libavformat/smacker.c trunk/blender/extern/ffmpeg/libavformat/sol.c trunk/blender/extern/ffmpeg/libavformat/swf.c trunk/blender/extern/ffmpeg/libavformat/tcp.c trunk/blender/extern/ffmpeg/libavformat/thp.c trunk/blender/extern/ffmpeg/libavformat/tiertexseq.c trunk/blender/extern/ffmpeg/libavformat/tta.c trunk/blender/extern/ffmpeg/libavformat/txd.c trunk/blender/extern/ffmpeg/libavformat/udp.c trunk/blender/extern/ffmpeg/libavformat/utils.c trunk/blender/extern/ffmpeg/libavformat/voc.h trunk/blender/extern/ffmpeg/libavformat/vocdec.c trunk/blender/extern/ffmpeg/libavformat/vocenc.c trunk/blender/extern/ffmpeg/libavformat/wav.c trunk/blender/extern/ffmpeg/libavformat/wc3movie.c trunk/blender/extern/ffmpeg/libavformat/westwood.c trunk/blender/extern/ffmpeg/libavformat/wv.c trunk/blender/extern/ffmpeg/libavformat/yuv4mpeg.c trunk/blender/extern/ffmpeg/libavutil/Makefile trunk/blender/extern/ffmpeg/libavutil/adler32.c trunk/blender/extern/ffmpeg/libavutil/adler32.h trunk/blender/extern/ffmpeg/libavutil/aes.c trunk/blender/extern/ffmpeg/libavutil/aes.h trunk/blender/extern/ffmpeg/libavutil/avstring.h trunk/blender/extern/ffmpeg/libavutil/avutil.h trunk/blender/extern/ffmpeg/libavutil/base64.c trunk/blender/extern/ffmpeg/libavutil/base64.h trunk/blender/extern/ffmpeg/libavutil/bswap.h trunk/blender/extern/ffmpeg/libavutil/common.h trunk/blender/extern/ffmpeg/libavutil/crc.c trunk/blender/extern/ffmpeg/libavutil/crc.h trunk/blender/extern/ffmpeg/libavutil/fifo.h trunk/blender/extern/ffmpeg/libavutil/integer.c trunk/blender/extern/ffmpeg/libavutil/integer.h trunk/blender/extern/ffmpeg/libavutil/internal.h trunk/blender/extern/ffmpeg/libavutil/intfloat_readwrite.h trunk/blender/extern/ffmpeg/libavutil/intreadwrite.h trunk/blender/extern/ffmpeg/libavutil/lls.c trunk/blender/extern/ffmpeg/libavutil/lls.h trunk/blender/extern/ffmpeg/libavutil/log.c trunk/blender/extern/ffmpeg/libavutil/log.h trunk/blender/extern/ffmpeg/libavutil/lzo.c trunk/blender/extern/ffmpeg/libavutil/lzo.h trunk/blender/extern/ffmpeg/libavutil/mathematics.c trunk/blender/extern/ffmpeg/libavutil/mathematics.h trunk/blender/extern/ffmpeg/libavutil/md5.c trunk/blender/extern/ffmpeg/libavutil/md5.h trunk/blender/extern/ffmpeg/libavutil/mem.c trunk/blender/extern/ffmpeg/libavutil/mem.h trunk/blender/extern/ffmpeg/libavutil/random.h trunk/blender/extern/ffmpeg/libavutil/rational.h trunk/blender/extern/ffmpeg/libavutil/sha1.c trunk/blender/extern/ffmpeg/libavutil/sha1.h trunk/blender/extern/ffmpeg/libavutil/softfloat.c trunk/blender/extern/ffmpeg/libavutil/softfloat.h trunk/blender/extern/ffmpeg/libavutil/tree.c trunk/blender/extern/ffmpeg/libavutil/tree.h trunk/blender/extern/ffmpeg/libavutil/x86_cpu.h trunk/blender/extern/ffmpeg/libpostproc/Makefile trunk/blender/extern/ffmpeg/libpostproc/postprocess.c trunk/blender/extern/ffmpeg/libpostproc/postprocess.h trunk/blender/extern/ffmpeg/libpostproc/postprocess_altivec_template.c trunk/blender/extern/ffmpeg/libpostproc/postprocess_internal.h trunk/blender/extern/ffmpeg/libpostproc/postprocess_template.c trunk/blender/extern/ffmpeg/libswscale/Makefile trunk/blender/extern/ffmpeg/libswscale/cs_test.c trunk/blender/extern/ffmpeg/libswscale/internal_bfin.S trunk/blender/extern/ffmpeg/libswscale/rgb2rgb.c trunk/blender/extern/ffmpeg/libswscale/rgb2rgb.h trunk/blender/extern/ffmpeg/libswscale/rgb2rgb_template.c trunk/blender/extern/ffmpeg/libswscale/swscale-example.c trunk/blender/extern/ffmpeg/libswscale/swscale.c trunk/blender/extern/ffmpeg/libswscale/swscale.h trunk/blender/extern/ffmpeg/libswscale/swscale_altivec_template.c trunk/blender/extern/ffmpeg/libswscale/swscale_bfin.c trunk/blender/extern/ffmpeg/libswscale/swscale_internal.h trunk/blender/extern/ffmpeg/libswscale/swscale_template.c trunk/blender/extern/ffmpeg/libswscale/yuv2rgb.c trunk/blender/extern/ffmpeg/libswscale/yuv2rgb_altivec.c trunk/blender/extern/ffmpeg/libswscale/yuv2rgb_bfin.c trunk/blender/extern/ffmpeg/libswscale/yuv2rgb_mlib.c trunk/blender/extern/ffmpeg/libswscale/yuv2rgb_template.c trunk/blender/extern/ffmpeg/libswscale/yuv2rgb_vis.c trunk/blender/source/blender/imbuf/intern/util.c trunk/blender/source/nan_definitions.mk Added Paths: ----------- trunk/blender/extern/ffmpeg/libavcodec/8svx.c trunk/blender/extern/ffmpeg/libavcodec/adx.h trunk/blender/extern/ffmpeg/libavcodec/adxdec.c trunk/blender/extern/ffmpeg/libavcodec/adxenc.c trunk/blender/extern/ffmpeg/libavcodec/bfin/vp3_bfin.c trunk/blender/extern/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S trunk/blender/extern/ffmpeg/libavcodec/dnxhdenc.c trunk/blender/extern/ffmpeg/libavcodec/escape124.c trunk/blender/extern/ffmpeg/libavcodec/faanidct.c trunk/blender/extern/ffmpeg/libavcodec/faanidct.h trunk/blender/extern/ffmpeg/libavcodec/huffman.c trunk/blender/extern/ffmpeg/libavcodec/huffman.h trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_h264_template_ssse3.c trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_mmx.h trunk/blender/extern/ffmpeg/libavcodec/i386/dsputil_yasm.asm trunk/blender/extern/ffmpeg/libavcodec/i386/dsputilenc_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/fft_mmx.asm trunk/blender/extern/ffmpeg/libavcodec/i386/flacdsp_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/vc1dsp_mmx.c trunk/blender/extern/ffmpeg/libavcodec/i386/x86inc.asm trunk/blender/extern/ffmpeg/libavcodec/imgconvert.h trunk/blender/extern/ffmpeg/libavcodec/intrax8.c trunk/blender/extern/ffmpeg/libavcodec/intrax8.h trunk/blender/extern/ffmpeg/libavcodec/intrax8dsp.c trunk/blender/extern/ffmpeg/libavcodec/intrax8huf.h trunk/blender/extern/ffmpeg/libavcodec/mimic.c trunk/blender/extern/ffmpeg/libavcodec/mlp_parser.c trunk/blender/extern/ffmpeg/libavcodec/mlp_parser.h trunk/blender/extern/ffmpeg/libavcodec/movsub_bsf.c trunk/blender/extern/ffmpeg/libavcodec/mpc.h trunk/blender/extern/ffmpeg/libavcodec/mpc7.c trunk/blender/extern/ffmpeg/libavcodec/mpc7data.h trunk/blender/extern/ffmpeg/libavcodec/mpc8.c trunk/blender/extern/ffmpeg/libavcodec/mpc8data.h trunk/blender/extern/ffmpeg/libavcodec/mpc8huff.h trunk/blender/extern/ffmpeg/libavcodec/mpeg4audio.c trunk/blender/extern/ffmpeg/libavcodec/mpeg4audio.h trunk/blender/extern/ffmpeg/libavcodec/nellymoserdec.c trunk/blender/extern/ffmpeg/libavcodec/pcx.c trunk/blender/extern/ffmpeg/libavcodec/ppc/check_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/imgresample_altivec.c trunk/blender/extern/ffmpeg/libavcodec/ppc/imgresample_altivec.h trunk/blender/extern/ffmpeg/libavcodec/ppc/util_altivec.h trunk/blender/extern/ffmpeg/libavcodec/rectangle.h trunk/blender/extern/ffmpeg/libavcodec/rl2.c trunk/blender/extern/ffmpeg/libavcodec/rv30.c trunk/blender/extern/ffmpeg/libavcodec/rv30data.h trunk/blender/extern/ffmpeg/libavcodec/rv30dsp.c trunk/blender/extern/ffmpeg/libavcodec/rv34.c trunk/blender/extern/ffmpeg/libavcodec/rv34.h trunk/blender/extern/ffmpeg/libavcodec/rv34data.h trunk/blender/extern/ffmpeg/libavcodec/rv34vlc.h trunk/blender/extern/ffmpeg/libavcodec/rv40.c trunk/blender/extern/ffmpeg/libavcodec/rv40data.h trunk/blender/extern/ffmpeg/libavcodec/rv40vlc2.h trunk/blender/extern/ffmpeg/libavcodec/sunrast.c trunk/blender/extern/ffmpeg/libavcodec/vb.c trunk/blender/extern/ffmpeg/libavcodec/wmv2.h trunk/blender/extern/ffmpeg/libavcodec/wmv2dec.c trunk/blender/extern/ffmpeg/libavcodec/wmv2enc.c trunk/blender/extern/ffmpeg/libavdevice/vfwcap.c trunk/blender/extern/ffmpeg/libavformat/asfcrypt.c trunk/blender/extern/ffmpeg/libavformat/asfcrypt.h trunk/blender/extern/ffmpeg/libavformat/avc.c trunk/blender/extern/ffmpeg/libavformat/avc.h trunk/blender/extern/ffmpeg/libavformat/crcenc.c trunk/blender/extern/ffmpeg/libavformat/eacdata.c trunk/blender/extern/ffmpeg/libavformat/framecrcenc.c trunk/blender/extern/ffmpeg/libavformat/iff.c trunk/blender/extern/ffmpeg/libavformat/lmlm4.c trunk/blender/extern/ffmpeg/libavformat/mpc8.c trunk/blender/extern/ffmpeg/libavformat/msnwc_tcp.c trunk/blender/extern/ffmpeg/libavformat/oggdec.c trunk/blender/extern/ffmpeg/libavformat/oggdec.h trunk/blender/extern/ffmpeg/libavformat/oggenc.c trunk/blender/extern/ffmpeg/libavformat/oggparsespeex.c trunk/blender/extern/ffmpeg/libavformat/pva.c trunk/blender/extern/ffmpeg/libavformat/rl2.c trunk/blender/extern/ffmpeg/libavformat/rpl.c trunk/blender/extern/ffmpeg/libavformat/rtpdec.c trunk/blender/extern/ffmpeg/libavformat/rtpenc.c trunk/blender/extern/ffmpeg/libavformat/rtpenc_h264.c trunk/blender/extern/ffmpeg/libavformat/siff.c trunk/blender/extern/ffmpeg/libavformat/vc1test.c trunk/blender/extern/ffmpeg/libavutil/crc_data.h trunk/blender/extern/ffmpeg/libavutil/des.c trunk/blender/extern/ffmpeg/libavutil/des.h trunk/blender/extern/ffmpeg/libavutil/rc4.c trunk/blender/extern/ffmpeg/libavutil/rc4.h trunk/blender/extern/ffmpeg/libswscale/swscale_avoption.c Removed Paths: ------------- trunk/blender/extern/ffmpeg/libavcodec/adx.c trunk/blender/extern/ffmpeg/libavcodec/ppc/mpegvideo_ppc.c trunk/blender/extern/ffmpeg/libavformat/audio.c trunk/blender/extern/ffmpeg/libavformat/bktr.c trunk/blender/extern/ffmpeg/libavformat/crc.c trunk/blender/extern/ffmpeg/libavformat/dv1394.c trunk/blender/extern/ffmpeg/libavformat/dv1394.h trunk/blender/extern/ffmpeg/libavformat/libdc1394.c trunk/blender/extern/ffmpeg/libavformat/ogg.c trunk/blender/extern/ffmpeg/libavformat/ogg2.c trunk/blender/extern/ffmpeg/libavformat/ogg2.h trunk/blender/extern/ffmpeg/libavformat/v4l.c trunk/blender/extern/ffmpeg/libavformat/v4l2.c trunk/blender/extern/ffmpeg/libavformat/x11grab.c Modified: trunk/blender/CMakeLists.txt =================================================================== --- trunk/blender/CMakeLists.txt 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/CMakeLists.txt 2008-12-17 20:52:39 UTC (rev 17912) @@ -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: trunk/blender/SConstruct =================================================================== --- trunk/blender/SConstruct 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/SConstruct 2008-12-17 20:52:39 UTC (rev 17912) @@ -322,10 +322,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: trunk/blender/config/darwin-config.py =================================================================== --- trunk/blender/config/darwin-config.py 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/config/darwin-config.py 2008-12-17 20:52:39 UTC (rev 17912) @@ -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: trunk/blender/config/irix6-config.py =================================================================== --- trunk/blender/config/irix6-config.py 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/config/irix6-config.py 2008-12-17 20:52:39 UTC (rev 17912) @@ -146,7 +146,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' Modified: trunk/blender/config/linux2-config.py =================================================================== --- trunk/blender/config/linux2-config.py 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/config/linux2-config.py 2008-12-17 20:52:39 UTC (rev 17912) @@ -139,8 +139,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 Modified: trunk/blender/config/sunos5-config.py =================================================================== --- trunk/blender/config/sunos5-config.py 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/config/sunos5-config.py 2008-12-17 20:52:39 UTC (rev 17912) @@ -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: trunk/blender/config/win32-mingw-config.py =================================================================== --- trunk/blender/config/win32-mingw-config.py 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/config/win32-mingw-config.py 2008-12-17 20:52:39 UTC (rev 17912) @@ -21,7 +21,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: trunk/blender/extern/ffmpeg/Makefile =================================================================== --- trunk/blender/extern/ffmpeg/Makefile 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/extern/ffmpeg/Makefile 2008-12-17 20:52:39 UTC (rev 17912) @@ -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: trunk/blender/extern/ffmpeg/SConscript =================================================================== --- trunk/blender/extern/ffmpeg/SConscript 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/extern/ffmpeg/SConscript 2008-12-17 20:52:39 UTC (rev 17912) @@ -3,13 +3,13 @@ Import('env') -all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil'] +all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil', 'libavdevice'] root = "extern/ffmpeg" if env['OURPLATFORM'] == 'win32-mingw': - ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame" + ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame" else: - ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame" + ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame" if env['WITH_BF_OGG']: ffmpeg_switches += " --enable-libogg --enable-libtheora --enable-libvorbis" Modified: trunk/blender/extern/ffmpeg/common.mak =================================================================== --- trunk/blender/extern/ffmpeg/common.mak 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/extern/ffmpeg/common.mak 2008-12-17 20:52:39 UTC (rev 17912) @@ -57,7 +57,7 @@ CFLAGS := $(CFLAGS_BACKUP) CFLAGS += -DHAVE_AV_CONFIG_H CFLAGS += -I.. -I../libavutil \ - -I../libavcodec -I../libavformat -I../libswscale \ + -I../libavcodec -I../libavformat -I../libswscale -I../libavdevice \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE \ $(OPTFLAGS) Modified: trunk/blender/extern/ffmpeg/configure =================================================================== --- trunk/blender/extern/ffmpeg/configure 2008-12-17 19:40:19 UTC (rev 17911) +++ trunk/blender/extern/ffmpeg/configure 2008-12-17 20:52:39 UTC (rev 17912) @@ -56,11 +56,12 @@ echo echo "Standard options:" echo " --help print this message" - echo " --log[=FILE|yes|no] log tests and output to FILE [config.err]" - echo " --prefix=PREFIX install in PREFIX [$PREFIX]" + echo " --logfile=FILE log tests and output to FILE [config.err]" + echo " --disable-logging do not log configure debug information" + echo " --prefix=PREFIX install in PREFIX [$prefix]" echo " --libdir=DIR install libs in DIR [PREFIX/lib]" echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]" - echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]" + echo " --incdir=DIR install includes in DIR [PREFIX/include]" echo " --mandir=DIR install man page in DIR [PREFIX/share/man]" echo " --enable-static build static libraries [default=yes]" echo " --disable-static do not build static libraries [default=no]" @@ -68,15 +69,20 @@ echo " --disable-shared do not build shared libraries [default=yes]" echo " --enable-gpl allow use of GPL code, the resulting libav*" echo " and ffmpeg will be under GPL [default=no]" - echo " --enable-pp enable GPLed postprocessing support [default=no]" - echo " --enable-swscaler software scaler support [default=no]" + echo " --enable-nonfree allow use of nonfree code, the resulting libav*" + echo " and ffmpeg will be unredistributable [default=no]" @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs