thresh@exchange devel/packages/ffmpeg $ git pull . remotes/git-svn
Merging HEAD with 416b3133c726c6f240319137b1685cdfeed5a2cc
Merging:
8308162d480c3eb917cafe2a980aa90a598ca61a initial
416b3133c726c6f240319137b1685cdfeed5a2cc Also ignore cpuid_test.
found 1 common ancestor(s):
1 virtual commit
CONFLICT (add/add): File libavcodec/dsputil.h added non-identically in both branches. Adding as libavcodec/dsputil.h~HEAD and libavcodec/dsputil.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/h263dec.c added non-identically in both branches. Adding as libavcodec/h263dec.c~HEAD and libavcodec/h263dec.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/h264.c added non-identically in both branches. Adding as libavcodec/h264.c~HEAD and libavcodec/h264.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/yuv2rgb.c added non-identically in both branches. Adding as libswscale/yuv2rgb.c~HEAD and libswscale/yuv2rgb.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/zmbv.c added non-identically in both branches. Adding as libavcodec/zmbv.c~HEAD and libavcodec/zmbv.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File ffserver.c added non-identically in both branches. Adding as ffserver.c~HEAD and ffserver.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/dsputil.c added non-identically in both branches. Adding as libavcodec/dsputil.c~HEAD and libavcodec/dsputil.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File Makefile added non-identically in both branches. Adding as Makefile~HEAD and Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/amr.c added non-identically in both branches. Adding as libavcodec/amr.c~HEAD and libavcodec/amr.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/utils.c added non-identically in both branches. Adding as libavcodec/utils.c~HEAD and libavcodec/utils.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/allcodecs.c added non-identically in both branches. Adding as libavcodec/allcodecs.c~HEAD and libavcodec/allcodecs.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libpostproc/Makefile added non-identically in both branches. Adding as libpostproc/Makefile~HEAD and libpostproc/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libpostproc/postprocess.c added non-identically in both branches. Adding as libpostproc/postprocess.c~HEAD and libpostproc/postprocess.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/vqavideo.c added non-identically in both branches. Adding as libavcodec/vqavideo.c~HEAD and libavcodec/vqavideo.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/h263.c added non-identically in both branches. Adding as libavcodec/h263.c~HEAD and libavcodec/h263.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/vmnc.c added non-identically in both branches. Adding as libavcodec/vmnc.c~HEAD and libavcodec/vmnc.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/swscale_altivec_template.c added non-identically in both branches. Adding as libswscale/swscale_altivec_template.c~HEAD and libswscale/swscale_altivec_template.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavutil/Makefile added non-identically in both branches. Adding as libavutil/Makefile~HEAD and libavutil/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File vhook/Makefile added non-identically in both branches. Adding as vhook/Makefile~HEAD and vhook/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/vorbis.h added non-identically in both branches. Adding as libavcodec/vorbis.h~HEAD and libavcodec/vorbis.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/yuv2rgb_mlib.c added non-identically in both branches. Adding as libswscale/yuv2rgb_mlib.c~HEAD and libswscale/yuv2rgb_mlib.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File doc/Makefile added non-identically in both branches. Adding as doc/Makefile~HEAD and doc/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/truemotion2.c added non-identically in both branches. Adding as libavcodec/truemotion2.c~HEAD and libavcodec/truemotion2.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File ffplay.c added non-identically in both branches. Adding as ffplay.c~HEAD and ffplay.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/mov.c added non-identically in both branches. Adding as libavformat/mov.c~HEAD and libavformat/mov.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/swscale_template.c added non-identically in both branches. Adding as libswscale/swscale_template.c~HEAD and libswscale/swscale_template.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/imgconvert.c added non-identically in both branches. Adding as libavcodec/imgconvert.c~HEAD and libavcodec/imgconvert.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/eval.c added non-identically in both branches. Adding as libavcodec/eval.c~HEAD and libavcodec/eval.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/swscale-example.c added non-identically in both branches. Adding as libswscale/swscale-example.c~HEAD and libswscale/swscale-example.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/Makefile added non-identically in both branches. Adding as libswscale/Makefile~HEAD and libswscale/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File MAINTAINERS added non-identically in both branches. Adding as MAINTAINERS~HEAD and MAINTAINERS~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/mpegvideo.h added non-identically in both branches. Adding as libavcodec/mpegvideo.h~HEAD and libavcodec/mpegvideo.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/Makefile added non-identically in both branches. Adding as libavformat/Makefile~HEAD and libavformat/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/rm.c added non-identically in both branches. Adding as libavformat/rm.c~HEAD and libavformat/rm.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/ratecontrol.c added non-identically in both branches. Adding as libavcodec/ratecontrol.c~HEAD and libavcodec/ratecontrol.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/i386/dsputil_mmx.c added non-identically in both branches. Adding as libavcodec/i386/dsputil_mmx.c~HEAD and libavcodec/i386/dsputil_mmx.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File doc/TODO added non-identically in both branches. Adding as doc/TODO~HEAD and doc/TODO~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/rv10.c added non-identically in both branches. Adding as libavcodec/rv10.c~HEAD and libavcodec/rv10.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/smacker.c added non-identically in both branches. Adding as libavcodec/smacker.c~HEAD and libavcodec/smacker.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libpostproc/postprocess_internal.h added non-identically in both branches. Adding as libpostproc/postprocess_internal.h~HEAD and libpostproc/postprocess_internal.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/utils.c added non-identically in both branches. Adding as libavformat/utils.c~HEAD and libavformat/utils.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/i386/dsputil_mmx_avg.h added non-identically in both branches. Adding as libavcodec/i386/dsputil_mmx_avg.h~HEAD and libavcodec/i386/dsputil_mmx_avg.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/avisynth.c added non-identically in both branches. Adding as libavformat/avisynth.c~HEAD and libavformat/avisynth.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File configure added non-identically in both branches. Adding as configure~HEAD and configure~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File Changelog added non-identically in both branches. Adding as Changelog~HEAD and Changelog~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/vp3.c added non-identically in both branches. Adding as libavcodec/vp3.c~HEAD and libavcodec/vp3.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/i386/idct_mmx_xvid.c added non-identically in both branches. Adding as libavcodec/i386/idct_mmx_xvid.c~HEAD and libavcodec/i386/idct_mmx_xvid.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File common.mak added non-identically in both branches. Adding as common.mak~HEAD and common.mak~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File tests/libav.regression.ref added non-identically in both branches. Adding as tests/libav.regression.ref~HEAD and tests/libav.regression.ref~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/cabac.h added non-identically in both branches. Adding as libavcodec/cabac.h~HEAD and libavcodec/cabac.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File doc/faq.texi added non-identically in both branches. Adding as doc/faq.texi~HEAD and doc/faq.texi~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File tests/Makefile added non-identically in both branches. Adding as tests/Makefile~HEAD and tests/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/asf-enc.c added non-identically in both branches. Adding as libavformat/asf-enc.c~HEAD and libavformat/asf-enc.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/swscale.c added non-identically in both branches. Adding as libswscale/swscale.c~HEAD and libswscale/swscale.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/yuv2rgb_altivec.c added non-identically in both branches. Adding as libswscale/yuv2rgb_altivec.c~HEAD and libswscale/yuv2rgb_altivec.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/dv.c added non-identically in both branches. Adding as libavcodec/dv.c~HEAD and libavcodec/dv.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavutil/avutil.h added non-identically in both branches. Adding as libavutil/avutil.h~HEAD and libavutil/avutil.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/qdrw.c added non-identically in both branches. Adding as libavcodec/qdrw.c~HEAD and libavcodec/qdrw.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/snow.c added non-identically in both branches. Adding as libavcodec/snow.c~HEAD and libavcodec/snow.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/opt.c added non-identically in both branches. Adding as libavcodec/opt.c~HEAD and libavcodec/opt.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/xvmcvideo.c added non-identically in both branches. Adding as libavcodec/xvmcvideo.c~HEAD and libavcodec/xvmcvideo.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/mjpeg.c added non-identically in both branches. Adding as libavcodec/mjpeg.c~HEAD and libavcodec/mjpeg.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/tscc.c added non-identically in both branches. Adding as libavcodec/tscc.c~HEAD and libavcodec/tscc.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/avcodec.h added non-identically in both branches. Adding as libavcodec/avcodec.h~HEAD and libavcodec/avcodec.h~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libswscale/cs_test.c added non-identically in both branches. Adding as libswscale/cs_test.c~HEAD and libswscale/cs_test.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/mpeg12.c added non-identically in both branches. Adding as libavcodec/mpeg12.c~HEAD and libavcodec/mpeg12.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/Makefile added non-identically in both branches. Adding as libavcodec/Makefile~HEAD and libavcodec/Makefile~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavformat/mxf.c added non-identically in both branches. Adding as libavformat/mxf.c~HEAD and libavformat/mxf.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File doc/ffmpeg-doc.texi added non-identically in both branches. Adding as doc/ffmpeg-doc.texi~HEAD and doc/ffmpeg-doc.texi~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/vc1.c added non-identically in both branches. Adding as libavcodec/vc1.c~HEAD and libavcodec/vc1.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/vorbis.c added non-identically in both branches. Adding as libavcodec/vorbis.c~HEAD and libavcodec/vorbis.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File ffmpeg.c added non-identically in both branches. Adding as ffmpeg.c~HEAD and ffmpeg.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.
CONFLICT (add/add): File libavcodec/mpegvideo.c added non-identically in both branches. Adding as libavcodec/mpegvideo.c~HEAD and libavcodec/mpegvideo.c~416b3133c726c6f240319137b1685cdfeed5a2cc instead.

Automatic merge failed; fix conflicts and then commit the result.